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 , 2014 +# JuneHyeon Bae , 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-12-14 04:22+0000\n" +"Last-Translator: JuneHyeon Bae \n" "Language-Team: Korean (http://www.transifex.com/projects/p/django/language/" "ko/)\n" "MIME-Version: 1.0\n" @@ -20,13 +23,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 "아제르바이잔어" @@ -36,7 +43,7 @@ #: conf/global_settings.py:55 msgid "Belarusian" -msgstr "" +msgstr "벨라루스어" #: conf/global_settings.py:56 msgid "Bengali" @@ -44,7 +51,7 @@ #: conf/global_settings.py:57 msgid "Breton" -msgstr "" +msgstr "브르타뉴어" #: conf/global_settings.py:58 msgid "Bosnian" @@ -79,320 +86,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 "" +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 "" +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 "프리슬란트어" -#: 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 "" +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" +#: 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 "노르웨이어 (뉘노르스크)" -#: 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 "우르드어" -#: 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 "" +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 "" +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 "" +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,8 +436,10 @@ "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"이 값이 최소 %(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 " @@ -411,290 +448,310 @@ "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"이 값이 최대 %(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 "이 필드는 null 값은 사용할 수 없습니다. " -#: 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' 값은 값이 없거나, 참 또는 거짓 중 하나 여야 합니다." -#: 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 "" +"'%(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]) 유효하" +"지 않은 date/time입니다." -#: 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' 값은 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 "" +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 byte)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" -msgstr "" +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' 값은 값이 없거나, 참 또는 거짓 중 하나 이어야 합니다." -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "boolean (참, 거짓 또는 none)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" -msgstr "" +msgstr "양의 정수" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" -msgstr "" +msgstr "양의 작은 정수" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" -msgstr "" +msgstr "슬러그(%(max_length)s 까지)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" -msgstr "" +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 "URL" -#: 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 "" +msgstr "파일" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" -msgstr "" +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 "Primary key %(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 "일대일 관계" -#: 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[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] "" +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." msgid_plural "" "Ensure that there are no more than %(max)s digits before the decimal point." -msgstr[0] "" +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 "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr[0] "" +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." @@ -702,61 +759,71 @@ "올바른 이미지를 업로드하세요. 업로드하신 파일은 이미지 파일이 아니거나 파일" "이 깨져 있습니다." -#: 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 (이)가 선택가능항목에 없습니다." +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 hidden 필드) %(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 "관리폼 데이터가 없거나 변조되었습니다." -#: 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[0] "%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 개 이상의 양식을 제출하세요." -#: 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 " @@ -765,46 +832,48 @@ "%(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 "부모 오브젝트의 primary key와 inline 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\"은/는 primary key로 적합하지 않습니다." -#: 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 "" +"%(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 "취소" @@ -820,62 +889,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 "정오" @@ -1151,111 +1220,127 @@ msgid "December" msgstr "12월" -#: 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[0] "%d년" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "" +msgstr[0] "%d개월" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" +msgstr[0] "%d주" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" +msgstr[0] "%d일" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" +msgstr[0] "%d시간" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" +msgstr[0] "%d분" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" +msgstr "0분" + +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Forbidden" + +#: 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/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." @@ -1264,7 +1349,7 @@ "Future 모듈 %(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'과 다릅니다." @@ -1274,16 +1359,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 "Invalid page (%(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 "Index of %(directory)s" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/lb/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/lb/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/lb/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/lb/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/lb/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/lb/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # sim0n , 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-03 23:25+0000\n" -"Last-Translator: sim0n \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: Luxembourgish (http://www.transifex.com/projects/p/django/" "language/lb/)\n" "MIME-Version: 1.0\n" @@ -27,6 +27,10 @@ msgstr "Arabesch" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "" @@ -79,318 +83,346 @@ msgstr "Englesch" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Britesch Englesch" -#: 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 "Spuenesch" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Argentinesch Spuenesch" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Mexikanesch Spuenesch" -#: 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 "Estonesch" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Baskesch" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Persesch" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Finnesch" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "Franséisch" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Frisesch" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Iresch" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Galesch" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebräesch" -#: 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 "Kroatesch" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Ungaresch" -#: 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 "Indonesesch" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Islännesch" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Italienesch" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Japanesch" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "Georgesch" -#: 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 "Kanadesch" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "Koreanesch" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Lëtzebuergesch" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Lithuanesesch" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Lättesch" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Macedonesch" -#: 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 "Mongolesch" -#: 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 "Norwegesch 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 "Hollännesch" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Norwegesch 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 "Polnesch" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Portugisesch" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Brasilianesch Portugisesch" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Rumänesch" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Russesch" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slowakesch" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slowenesch" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Albanesch" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Serbesch" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Serbesch Latäinesch" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Schwedesch" -#: 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 "Thai" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Tierkesch" -#: 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 "Ukrainesch" -#: 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 "Vietnamesesch" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Einfach d'Chinesesch" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Traditionell d'Chinesesch" +#: 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 "Gëff en validen Wärt an." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Gëff eng valid URL an." -#: 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 "Gëff eng valid e-mail Adress an." -#: 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 "Gëff eng valid IPv4 Adress an." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Gëff eng valid IPv6 Adress an." -#: 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 "Gëff eng valid IPv4 oder IPv6 Adress an." -#: 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 " @@ -401,7 +433,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 " @@ -412,247 +444,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 "an" -#: 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 "Zuel" -#: 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 "Datum (ouni Zäit)" -#: 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 (mat Zäit)" -#: 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 "Dezimalzuel" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-mail Adress" -#: 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 "Kommazuel" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Grouss (8 byte) Zuel" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "IPv4 Adress" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "IP Adress" -#: 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 "Positiv Zuel" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Kleng positiv Zuel" -#: 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 "Kleng Zuel" -#: 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 "Zäit" -#: 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 "Rei Binär Daten" -#: 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 "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 "" -#: 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." @@ -661,31 +701,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 "Et ass keng Datei geschéckt ginn." -#: 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 "" @@ -693,31 +733,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 "" -#: 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 "Gëff eng Lescht vun Wäerter an." +#: 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,84 +769,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 "Sortéier" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Läsch" -#: 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 "Momentan" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Änner" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Maach eidel" @@ -818,63 +869,63 @@ msgid "No" msgstr "Nee" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "jo,nee,vläit" -#: 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 "%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 "" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "" @@ -1150,124 +1201,140 @@ 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 "" -#: 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 Joer" msgstr[1] "%d Joren" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d Mount" msgstr[1] "%d Meint" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d Woch" msgstr[1] "%d Wochen" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d Dag" msgstr[1] "%d Deeg" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d Stonn" msgstr[1] "%d Stonnen" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d Minutt" msgstr[1] "%d Minutten" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "0 Minutten" -#: 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 "" @@ -1277,16 +1344,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/lt/formats.py python-django-1.7.4/django/conf/locale/lt/formats.py --- python-django-1.6.6/django/conf/locale/lt/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/lt/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -17,7 +17,7 @@ # 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', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' + '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' ) TIME_INPUT_FORMATS = ( '%H:%M:%S', # '14:30:59' Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/lt/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/lt/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/lt/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/lt/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/lt/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/lt/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,15 +7,15 @@ # naktinis , 2012 # Nikolajus Krauklis , 2013 # Povilas Balzaravičius , 2011-2012 -# Simonas Kazlauskas , 2012-2013 +# Simonas Kazlauskas , 2012-2014 # Vytautas Astrauskas , 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-23 15:55+0000\n" -"Last-Translator: Simonas Kazlauskas \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: Lithuanian (http://www.transifex.com/projects/p/django/" "language/lt/)\n" "MIME-Version: 1.0\n" @@ -34,6 +34,10 @@ msgstr "Arabų" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbaidžaniečių" @@ -86,322 +90,350 @@ msgstr "Anglų" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Britų Anglų" -#: 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 "Ispanų" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Argentiniečių Ispanų" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Meksikiečių Ispanų" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Nikaragvos Ispanijos" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Venesuelos Ispanų" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Estų" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Baskų" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Persų" -#: 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 "Prancūzų" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Fryzų" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Airių" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Galų" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebrajų" -#: 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 "Kroatų" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Vengrų" -#: 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 "Indoneziečių" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Islandų" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Italų" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Japonų" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "Gruzinų" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "Kazachų" -#: 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 "Dravidų" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "Korėjiečių" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Liuksemburgų" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Lietuvių" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Latvių" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Makedonų" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Malajalių" -#: 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 "Mjanmų" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Norvegų 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 "Olandų" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Norvegų Nynorsk" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Osetinų" -#: 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 "Lenkų" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Protugalų" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Brazilijos Portugalų" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Rumunų" -#: 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 "Slovakų" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slovėnų" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Albanų" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Serbų" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Serbų Lotynų" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Švedų" -#: conf/global_settings.py:119 +#: conf/global_settings.py:120 msgid "Swahili" msgstr "Svahili" -#: 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 "Telugų" -#: conf/global_settings.py:122 +#: conf/global_settings.py:123 msgid "Thai" msgstr "Tailando" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Turkų" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Totorių" -#: 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 "Ukrainiečių" -#: 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 "Vietnamiečių" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Supaprastinta kinų" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Tradicinė kinų" +#: 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 "Įveskite tinkamą reikšmę." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Įveskite tinkamą URL adresą." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Įveskite tinkamą skaičių." +msgstr "" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Įveskite teisingą el. pašto adresą." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Šią reikšmę gali sudaryti tik raidės, skaičiai, pabraukimo arba paprasto " "brūkšnio simboliai." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Įveskite validų IPv4 adresą." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Įveskite validų IPv6 adresą." -#: 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 "Įveskite validų IPv4 arba IPv6 adresą." -#: 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 "Įveskite skaitmenis atskirtus kableliais." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" "Įsitikinkite, kad reikšmę sudaro %(limit_value)s simbolių (dabar yra " "%(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 "Įsitikinkite, kad reikšmė yra mažesnė arba lygi %(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 "Įsitikinkite, kad reikšmė yra didesnė arba lygi %(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 +451,7 @@ "Įsitikinkite, kad reikšmė sudaryta iš nemažiau kaip %(limit_value)d ženklų " "(dabartinis ilgis %(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 " @@ -437,245 +469,241 @@ "Įsitikinkite, kad reikšmė sudaryta iš nedaugiau kaip %(limit_value)d ženklų " "(dabartinis ilgis %(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 privalo būti unikalus %(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 "ir" -#: 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 su šiuo %(field_label)s jau egzistuoja." +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 "Reikšmės %(value)r rinktis negalima." +msgstr "" -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Šis laukas negali būti null." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Lauką privaloma užpildyti." -#: 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 su šiuo %(field_label)s jau egzistuoja." + +#. 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 "Lauko tipas: %(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 "Sveikas skaičius" -#: 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' turi būti skaičius." +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' reikšmė turi būti arba True, arba False." +msgstr "" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" -msgstr "Loginė reikšmė (True arba False)" +msgstr "Loginė reikšmė (Tiesa arba Netiesa)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Eilutė (ilgis iki %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Kableliais atskirti sveikieji skaičiai" -#: 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' reikšmė yra netinkamu datos formatu. Reikšmė turi būti YYYY-MM-" -"DD formatu." -#: 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' reikšmė yra teisingo YYYY-MM-DD formato, tačiau tai nėra " -"teisinga data." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Data (be laiko)" -#: 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' reikšmė yra neteisingo formato. Reikšmė turi būti pateikta YYYY-" -"MM-DD HH:MM[:ss[.uuuuuu]][TZ] formatu." -#: 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' reikšmė yra teisingo YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] formato, " -"tačiau tai nėra teisinga data ar laikas." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Data (su laiku)" -#: 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' reikšmė turi būti dešimtainis skaičius." +msgstr "" -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Dešimtainis skaičius" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "El. pašto adresas" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Kelias iki failo" -#: 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' reikšmė turi būti slankiojo kablelio skaičius." +msgstr "" -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Slankaus kablelio skaičius" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Didelis (8 baitų) sveikas skaičius" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "IPv4 adresas" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "IP adresas" -#: 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' reikšmė turi būti None, True arba False." +msgstr "" -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" -msgstr "Loginė reikšmė (True, False arba None)" +msgstr "Loginė reikšmė (Tiesa, Netiesa arba Nieko)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Teigiamas sveikasis skaičius" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Nedidelis teigiamas sveikasis skaičius" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Unikalus adresas (iki %(max_length)s ženklų)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Nedidelis sveikasis skaičius" -#: db/models/fields/__init__.py:1276 +#: db/models/fields/__init__.py:1870 msgid "Text" msgstr "Tekstas" -#: 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' reikšmė yra neteisingo formato. Reikšmė turi būti pateikta HH:MM" -"[:ss[.uuuuuu]] formatu." -#: 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' reikšmė yra teisingo HH:MM[:ss[.uuuuuu]] formato, tačiau tai " -"nėra teisingas laikas." -#: db/models/fields/__init__.py:1299 +#: db/models/fields/__init__.py:1898 msgid "Time" msgstr "Laikas" -#: 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 "Neapdorota informacija" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Failas" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Paveiksliukas" -#: 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 modelio instancija su pirminiu raktu %(pk)r neegzistuoja." +msgstr "" -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Išorinis raktas (tipas nustatomas susijusiame lauke)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Sąryšis vienas su vienu" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Sąryšis daug su daug" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Šis laukas yra privalomas." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Įveskite pilną skaičių." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Įveskite skaičių." -#: 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." @@ -683,7 +711,7 @@ msgstr[1] "Įsitikinkite, kad yra nedaugiau nei %(max)s skaitmenys." msgstr[2] "Įsitikinkite, kad yra nedaugiau nei %(max)s skaitmenų." -#: 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." @@ -691,7 +719,7 @@ msgstr[1] "Įsitikinkite, kad yra nedaugiau nei %(max)s skaitmenys po kablelio." msgstr[2] "Įsitikinkite, kad yra nedaugiau nei %(max)s skaitmenų po kablelio." -#: 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." @@ -703,31 +731,31 @@ msgstr[2] "" "Įsitikinkite, kad yra nedaugiau nei %(max)s skaitmenų prieš kablelį." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Įveskite tinkamą datą." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Įveskite tinkamą laiką." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Įveskite tinkamą datą/laiką." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Nebuvo nurodytas failas. Patikrinkite formos koduotę." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Failas nebuvo nurodytas." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Nurodytas failas yra tuščias." -#: 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 "" @@ -742,11 +770,11 @@ "Įsitikinkite, kad failo pavadinimas sudarytas iš nedaugiau kaip %(max)d " "ženklų (dabartinis ilgis %(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Nurodykite failą arba pažymėkite išvalyti. Abu pasirinkimai negalimi." -#: 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." @@ -754,21 +782,25 @@ "Atsiųskite tinkamą paveiksliuką. Failas, kurį siuntėte nebuvo paveiksliukas, " "arba buvo sugadintas." -#: 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 "Nurodykite tinkamą reikšmę. %(value)s nėra galimas pasirinkimas." -#: 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 "Įveskite reikšmių sarašą." +#: 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 "(Paslėptas laukelis %(name)s) %(error)s" @@ -776,15 +808,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 "ManagementForm duomenys buvo sugadinti arba neegzistuoja" +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." @@ -792,27 +824,35 @@ msgstr[1] "Prašome pateikti %d arba mažiau formų." msgstr[2] "Prašome pateikti %d arba mažiau formų." -#: 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 "Nurodyti" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Ištrinti" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Pataisykite pasikartojančius duomenis laukui %(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 "" "Pataisykite pasikartojančius duomenis laukui %(field)s. Duomenys privalo " "būti unikalū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 " @@ -821,31 +861,31 @@ "Pataisykite pasikartojančius duomenis laukui %(field_name)s. Duomenys " "privalo būti unikalūs %(lookup)s peržiūroms per %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Pataisykite žemiau esančias pasikartojančias reikšmes." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "Išorinis raktas neatitinka tėvinio objekto pirminio rakto." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Pasirinkite tinkamą reikšmę. Parinkta reikšmė nėra galima." -#: 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ėra pirminiam raktui tinkama reikšmė." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Nuspauskite \"Control\", arba \"Command\" Mac kompiuteriuose, kad pasirinkti " "daugiau nei vieną." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -854,15 +894,15 @@ "Nepavyko interpretuoti %(datetime)s %(current_timezone)s laiko juostoje; " "Data gali turėti keletą reikšmių arba neegzistuoti." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Šiuo metu" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Pakeisti" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Išvalyti" @@ -878,11 +918,11 @@ msgid "No" msgstr "Ne" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "taip,ne,galbūt" -#: 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" @@ -890,52 +930,52 @@ msgstr[1] "%(size)d baitai" msgstr[2] "%(size)d baitai" -#: 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 "vidurnaktis" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "vidurdienis" @@ -1211,36 +1251,26 @@ msgid "December" msgstr "gruodžio" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Nepavyko importuoti nei PIL nei Pillow bibliotekos: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "Nepavyko importuoti '_imaging' modulio iš PIL paketo: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." -msgstr "Tai nėra teisingas IPv6 adresas." +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 "arba" #. 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" @@ -1248,7 +1278,7 @@ msgstr[1] "%d metai" msgstr[2] "%d metų" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1256,7 +1286,7 @@ msgstr[1] "%d mėnesiai" msgstr[2] "%d mėnesių" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1264,7 +1294,7 @@ msgstr[1] "%d savaitės" msgstr[2] "%d savaičių" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1272,7 +1302,7 @@ msgstr[1] "%d dienos" msgstr[2] "%d dienų" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1280,7 +1310,7 @@ msgstr[1] "%d valandos" msgstr[2] "%d valandų" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1288,46 +1318,72 @@ msgstr[1] "%d minutės" msgstr[2] "%d minučių" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "0 minučių" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Aplankų indeksai čia neleidžiami." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" neegzistuoja" +#: 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 indeksas" +#: 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 "Nenurodyti metai" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Nenurodytas mėnuo" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Nenurodyta diena" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Nenurodyta savaitė" -#: 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ėra %(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." @@ -1336,7 +1392,7 @@ "Ateities %(verbose_name_plural)s nėra prieinami, nes %(class_name)s." "allow_future yra 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 '%(datestr)s' neatitinka formato '%(format)s'" @@ -1346,17 +1402,31 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Atitinkantis užklausą %(verbose_name)s nerastas" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "Puslapis nėra 'paskutinis', taip pat negali būti paverstas į sveiką skaičių." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Neegzistuojantis puslapis (%(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 "Tuščias sąrašas ir '%(class_name)s.allow_empty' yra False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Aplankų indeksai čia neleidžiami." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" neegzistuoja" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "%(directory)s indeksas" diff -Nru python-django-1.6.6/django/conf/locale/lv/formats.py python-django-1.7.4/django/conf/locale/lv/formats.py --- python-django-1.6.6/django/conf/locale/lv/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/lv/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -12,13 +12,13 @@ MONTH_DAY_FORMAT = 'j. F' SHORT_DATE_FORMAT = r'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 # Kept ISO formats as they are in first position DATE_INPUT_FORMATS = ( - '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' + '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' ) TIME_INPUT_FORMATS = ( '%H:%M:%S', # '14:30:59' @@ -45,5 +45,5 @@ '%d.%m.%y', # '25.10.06' ) 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/lv/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/lv/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/lv/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/lv/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/lv/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/lv/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,12 +3,13 @@ # Translators: # edgars , 2011 # Jannis Leidel , 2011 +# krikulis , 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: Latvian (http://www.transifex.com/projects/p/django/language/" "lv/)\n" @@ -21,23 +22,27 @@ #: conf/global_settings.py:51 msgid "Afrikaans" -msgstr "" +msgstr "āfrikāņu" #: conf/global_settings.py:52 msgid "Arabic" msgstr "arābu" #: conf/global_settings.py:53 -msgid "Azerbaijani" +msgid "Asturian" msgstr "" +#: conf/global_settings.py:53 +msgid "Azerbaijani" +msgstr "azerbaidžāņu" + #: conf/global_settings.py:54 msgid "Bulgarian" msgstr "bulgāru" #: conf/global_settings.py:55 msgid "Belarusian" -msgstr "" +msgstr "baltkrievu" #: conf/global_settings.py:56 msgid "Bengali" @@ -45,7 +50,7 @@ #: conf/global_settings.py:57 msgid "Breton" -msgstr "" +msgstr "bretoņu" #: conf/global_settings.py:58 msgid "Bosnian" @@ -80,320 +85,348 @@ msgstr "angļu" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Lielbritānijas angļu" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Esperanto" -msgstr "" +msgstr "esperanto" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Spanish" msgstr "spāņu" -#: 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 "igauņu" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "basku" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "persiešu" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "somu" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "franču" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "frīzu" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "īru" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "galīciešu" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "ebreju" -#: 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ātu" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "ungāru" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Interlingua" -msgstr "" +msgstr "modernā latīņu valoda" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Indonesian" +msgstr "indonēziešu" + +#: conf/global_settings.py:88 +msgid "Ido" msgstr "" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "islandiešu" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "itāļu" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Japāņu" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "vācu" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" -msgstr "" +msgstr "kazahu" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "khmeru" -#: conf/global_settings.py:93 +#: conf/global_settings.py:94 msgid "Kannada" msgstr "kannādiešu" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "korejiešu" -#: 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 "lietuviešu" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "latviešu" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "maķedoniešu" -#: 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 "mongoļu" + +#: conf/global_settings.py:102 +msgid "Marathi" msgstr "" -#: conf/global_settings.py:101 +#: 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 "holandiešu" -#: 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 "poļu" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "portugāļu" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Brazīlijas portugāļu" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "rumāņu" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "krievu" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "slovāku" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "slovēņu" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "albāņu" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "serbu" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "serbu latīņu" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "zviedru" -#: conf/global_settings.py:119 +#: conf/global_settings.py:120 msgid "Swahili" -msgstr "" +msgstr "svahili" -#: conf/global_settings.py:120 +#: conf/global_settings.py:121 msgid "Tamil" msgstr "tamilu" -#: 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 "taizemiešu" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "turku" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" -msgstr "" +msgstr "tatāru" -#: 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 "ukraiņu" -#: 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 "vjetnamiešu" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "vienkāršā ķīniešu" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "tradicionālā ķīniešu" +#: contrib/sitemaps/apps.py:8 +msgid "Site Maps" +msgstr "Lapas kartes" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Statiski faili" + +#: contrib/syndication/apps.py:8 +msgid "Syndication" +msgstr "Sindikācija" + +#: contrib/webdesign/apps.py:8 +msgid "Web Design" +msgstr "" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "Ievadiet korektu vērtību." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Ievadiet korektu URL adresi." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "" +msgstr "Ievadiet veselu skaitli." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." -msgstr "" +msgstr "Ievadiet korektu e-pasta adresi" -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Ievadiet korektu vērtību, kas satur tikai burtus, numurus, apakšsvītras vai " "šķērssvītras." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Ievadiet korektu IPv4 adresi." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." -msgstr "" +msgstr "Ievadiet korektu IPv6 adresi" -#: 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 "Ievadiet korektu IPv4 vai IPv6 adresi" -#: 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 "Ievadiet tikai numurus, atdalītus ar komatiem." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Nodrošiniet, ka vērtība ir %(limit_value)s (tā satur %(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 "Šai vērtībai jabūt mazākai vai vienādai ar %(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 "Vērtībai jābūt lielākai vai vienādai ar %(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,10 +435,13 @@ "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Vērtībai jābūt vismaz %(limit_value)d zīmēm (tai ir %(show_value)d)." msgstr[1] "" +"Vērtībai jābūt vismaz %(limit_value)d zīmei (tai ir %(show_value)d)." msgstr[2] "" +"Vērtībai jābūt vismaz %(limit_value)d zīmēm (tai ir %(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,236 +450,247 @@ "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Vērtībai jābūt ne vairāk kā %(limit_value)d zīmēm (tai ir %(show_value)d)." msgstr[1] "" +"Vērtībai jābūt ne vairāk kā %(limit_value)d zīmei (tai ir %(show_value)d)." msgstr[2] "" +"Vērtībai jābūt ne vairāk kā %(limit_value)d zīmēm (tai ir %(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 jābūt unikālam %(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 "un" -#: 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 ar nosaukumu %(field_label)s jau eksistē." +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 "Šis lauks nevar neksistēt (būt null)." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Šis lauks nevar būt tukšs" -#: 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 ar nosaukumu %(field_label)s jau eksistē." + +#. 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 "Lauks ar tipu: %(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 "Vesels skaitlis" -#: 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 vai False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Simbolu virkne (līdz pat %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Ar komatu atdalīti veselie skaitļi" -#: 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 "Datums (bez laika)" -#: 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 "Datums (ar laiku)" -#: 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 "Decimāls skaitlis" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-pasta adrese" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Faila ceļš" -#: 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 "Plūstošā punkta skaitlis" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Liels (8 baitu) vesels skaitlis" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" -msgstr "" +msgstr "IPv4 adrese" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "IP adrese" -#: 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 (jā, nē vai neviens)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" -msgstr "" +msgstr "Naturāls skaitlis" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" -msgstr "" +msgstr "Mazs pozitīvs vesels skaitlis" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" -msgstr "" +msgstr "Identifikators (līdz %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" -msgstr "" +msgstr "Mazs vesels skaitlis" -#: db/models/fields/__init__.py:1276 +#: db/models/fields/__init__.py:1870 msgid "Text" msgstr "Teksts" -#: 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 "Laiks" -#: 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 "Bināri dati" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" -msgstr "" +msgstr "Fails" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" -msgstr "" +msgstr "Attēls" -#: 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 "Ārējā atslēga (tipu nosaka lauks uz kuru attiecas)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Attiecība viens pret vienu" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Attiecība daudzi pret daudziem" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Šis lauks ir obligāts." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Ievadiet veselu skaitli." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Ievadiet skaitli." -#: 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." @@ -651,7 +698,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." @@ -659,7 +706,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." @@ -669,31 +716,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 "Ievadiet korektu datumu." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Ievadiet korektu laiku." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Ievadiet korektu datumu/laiku." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Nav nosūtīts fails. Pārbaudiet formas kodējuma tipu." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Netika nosūtīts fails." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Jūsu nosūtītais fails ir tukšs." -#: 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,11 +749,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." @@ -714,21 +761,25 @@ "Augšupielādējiet korektu attēlu. Fails, ko augšupielādējāt, vai nu nav " "attēls, vai arī ir bojāts." -#: 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 "Izvēlieties korektu izvēli. %(value)s nav pieejamo izvēļu sarakstā." -#: 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 "Ievadiet sarakstu ar vērtībām." +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "Ievadiet pilnu vērtību." + #. 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 "" @@ -736,42 +787,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 "" +msgstr "Trūkst ManagementForm dati vai arī tie ir bojāti" -#: 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[0] "Lūdzu ievadiet %d vai mazāk formas." +msgstr[1] "Lūdzu ievadiet %d vai mazāk formas." +msgstr[2] "Lūdzu ievadiet %d vai mazāk formas." + +#: forms/formsets.py:339 +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "Lūdzu ievadiet %d vai vairāk formas " +msgstr[1] "Lūdzu ievadiet %d vai vairāk formas " +msgstr[2] "Lūdzu ievadiet %d vai vairāk formas " -#: forms/formsets.py:350 forms/formsets.py:352 +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "Sakārtojums" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Dzēst" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Lūdzu izlabojiet dublicētos datus priekš %(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 "" "Lūdzu izlabojiet dublicētos datus laukam %(field)s, kam jābūt unikālam." -#: 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,46 +839,46 @@ "Lūdzu izlabojiet dublicētos datus laukam %(field_name)s, kam jābūt unikālam " "priekš %(lookup)s iekš %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Lūdzu izlabojiet dublicētās vērtības zemāk." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "Iekļautā ārējā atslēga nesakrita ar vecāka elementa primāro atslēgu" -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Izvēlaties pareizu izvēli. Jūsu izvēlele neietilpst pieejamo sarakstā." -#: 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\" nav derīga vērtība primārajai atslēgai." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Lai iezīmētu vairāk par vienu, pieturiet \"Ctrl\" (\"Command\" uz Mac " "datora) taustiņu." -#: 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 "Izmainīt" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "" @@ -835,11 +894,11 @@ msgid "No" msgstr "Nē" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "jā,nē,varbūt" -#: 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" @@ -847,52 +906,52 @@ msgstr[1] "%(size)d baiti" msgstr[2] "%(size)d baitu" -#: 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 "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 "pusnakts" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "dienasvidus" @@ -1168,36 +1227,26 @@ msgid "December" msgstr "decembris" -#: 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 "Šī nav derīga IPv6 adrese." -#: 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 "vai" #. 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" @@ -1205,7 +1254,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1213,7 +1262,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1221,7 +1270,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1229,7 +1278,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1237,7 +1286,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1245,53 +1294,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 "Aizliegts" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "CSRF pārbaude neizdevās. Pieprasījums pārtrauks." + +#: 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" +#: 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" +#: 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/generic/dates.py:42 -msgid "No year specified" +#: 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:98 +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "Vairāk informācijas ir pieejams ar DEBUG=True" + +#: views/generic/dates.py:43 +msgid "No year specified" +msgstr "Nav norādīts gads" + +#: views/generic/dates.py:99 msgid "No month specified" -msgstr "" +msgstr "Nav norādīts mēnesis" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" -msgstr "" +msgstr "Nav norādīta diena" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" -msgstr "" +msgstr "Nav norādīta nedēļa" -#: 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 "" @@ -1301,16 +1376,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 "\"%(path)s\" neeksistē" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "" diff -Nru python-django-1.6.6/django/conf/locale/mk/formats.py python-django-1.7.4/django/conf/locale/mk/formats.py --- python-django-1.6.6/django/conf/locale/mk/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/mk/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -7,37 +7,37 @@ # see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date DATE_FORMAT = 'd F Y' TIME_FORMAT = 'H:i:s' -DATETIME_FORMAT = 'j. F Y. H:i' -YEAR_MONTH_FORMAT = 'F Y.' +DATETIME_FORMAT = 'j. F Y H:i' +YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j. F' -SHORT_DATE_FORMAT = 'j.m.Y.' -SHORT_DATETIME_FORMAT = 'j.m.Y. H:i' +SHORT_DATE_FORMAT = 'j.m.Y' +SHORT_DATETIME_FORMAT = 'j.m.Y H:i' FIRST_DAY_OF_WEEK = 1 # 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.', # '25. 10. 2006.', '25. 10. 06.' + '%d.%m.%Y', '%d.%m.%y', # '25.10.2006', '25.10.06' + '%d. %m. %Y', '%d. %m. %y', # '25. 10. 2006', '25. 10. 06' ) 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.' - '%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' + '%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/mk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/mk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/mk/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/mk/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/mk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/mk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# vvangelovski , 2013 +# vvangelovski , 2013-2014 # vvangelovski , 2011-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-23 11:24+0000\n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-09-30 08:49+0000\n" "Last-Translator: vvangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/django/" "language/mk/)\n" @@ -28,6 +28,10 @@ msgstr "Арапски" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "Астуриски" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Азербејџански" @@ -80,324 +84,352 @@ msgstr "Англиски" #: conf/global_settings.py:66 -msgid "British English" -msgstr "Британскиот англиски" +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:68 +#: conf/global_settings.py:69 msgid "Spanish" msgstr "Шпански" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" -msgstr "Аргентински Шпански" +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 "Норвешка bokmål" +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 "Норвешки Нинорск" +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 "Упростен кинески" +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 "Внесете валидна email адреса." -#: 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 "Внесeте правилна 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 " @@ -412,7 +444,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 " @@ -427,258 +459,268 @@ "Осигурајте се дека оваа вредност има најмногу %(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 не е валиден избор." +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 "'%(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' вредноста мора да биде Точно или Неточно." +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)" +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' вредноста има невалидно форматиран датум. Мора да биде во ГГГГ-" -"ММ-ДД формат." +"Вредноста '%(value)s' има погрешен формат на датум. Мора да биде во форматот " +"ГГГГ-ММ-ДД." -#: 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' вредноста има точен формат (ГГГГ-ММ-ДД) но не е валиден датум." +"Вредноста '%(value)s' има точен формат (ГГГГ-MM-ДД) но не е валиден датум." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" -msgstr "Датум (без час)" +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] формат." +"Вредноста '%(value)s' има неточен формат. Таа мора да биде во ГГГГ-MM-ДД ЧЧ:" +"MM[:сс[.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 "" -"'%(value)s' вредноста има точен формат (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) " -"но не е валиден датум со време." +"Вредноста '%(value)s' има точен формат (ГГ-MM-ДД ЧЧ:MM[:сс[.uuuuuu]][ВЗ]) но " +"не е валиден датум со време." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" -msgstr "Датум (со час)" +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' вредноста мора да биде децимален број." +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 "Е-пошта" +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 "'%(value)s' вредноста мора да биде број со подвижна запирка." +msgstr "Вредноста '%(value)s' мора да биде децимален број со подвижна запирка." -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" -msgstr "Децимален број" +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 "ИП адреса" +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' вредноста мора да биде Ништо, Точно или Неточно." +msgstr "Вредноста '%(value)s' мора да биде ништо, точно или неточно." -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" -msgstr "Логичка (точно,неточно или празно)" +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)" +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 "" -"'%(value)s' вредноста има неточен формат. Мора да биде во HH:MM[:ss[." -"uuuuuu]] format." +"Вредноста '%(value)s' има неточен формат. Таа мора да биде во ГГГГ-ММ-ДД ЧЧ:" +"MM[:сс[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]]) но е невалидно " -"време." +"Вредноста '%(value)s' има точен формат (ЧЧ:MM [:сс[uuuuuu]]) но не " +"претставува валидно време." -#: db/models/fields/__init__.py:1299 +#: db/models/fields/__init__.py:1898 msgid "Time" -msgstr "Час" +msgstr "Време" -#: db/models/fields/__init__.py:1368 +#: db/models/fields/__init__.py:1977 msgid "URL" -msgstr "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 "Надворешен клуч (типот е одреден според сврзаното поле)" +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 "Внеси цел број." +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." @@ -689,31 +731,31 @@ 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 "" @@ -725,11 +767,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 "Или прикачете датотека или оттштиклирајте го полето." +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." @@ -737,21 +781,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" @@ -759,42 +807,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 "податоците од ManagementForm недостасуваат или се променети" +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 " @@ -803,33 +858,33 @@ "Ве молам поправете ја дуплираната вредност за %(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“ на Мекинтош, за да изберете повеќе од " "едно." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -838,15 +893,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 "Исчисти" @@ -862,63 +917,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 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 "пладне" @@ -1194,117 +1249,147 @@ 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 хедер\" да " +"биде испратен од вашиот веб пребарувач, но ниту еден таков хедер не беше " +"испратен. Овој хедер е потребен од безбедносни причини, за осигирување дека " +"вашиот прелистувач не е киднапиран од страна на трети лица." -#: 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' хедерот, ве молиме овозможето праќањето барем за овој сајт или за " +"HTTPS конекции или за барања од 'ист извор'." + +#: 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 колаче (cookie) за да се " +"поднесуваат форми. Ова колаче е потребно од безбедносни причини, за да се " +"осигураме дека вашиот веб прелистувач не е грабнат и контролиран од трети " +"страни." + +#: 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 "Повеќе информации се достапни со 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." @@ -1313,7 +1398,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'" @@ -1323,18 +1408,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 "" "Страницата не е \"последна\", ниту пак може да се конвертира во еден цел " "број." -#: 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/ml/formats.py python-django-1.7.4/django/conf/locale/ml/formats.py --- python-django-1.6.6/django/conf/locale/ml/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ml/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/ml/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ml/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/ml/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ml/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/ml/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ml/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: -# anivar , 2013 +# Anivar Aravind , 2013 # Jannis Leidel , 2011 # Jeffy , 2012 # Rajeesh Nair , 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-11-19 15:38+0000\n" -"Last-Translator: anivar \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: Malayalam (http://www.transifex.com/projects/p/django/" "language/ml/)\n" "MIME-Version: 1.0\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 "" "അക്ഷരങ്ങള്‍, അക്കങ്ങള്‍, അണ്ടര്‍സ്കോര്‍, ഹൈഫന്‍ എന്നിവ മാത്രം അടങ്ങിയ സാധുതയുള്ള ഒരുവാക്ക് " "ചുരുക്കവാക്കായി നല്‍കുക " -#: 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 "%(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 "ശരിയോ തെറ്റോ (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] "" 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,13 +737,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 "" "ഒന്നുകില്‍ ഫയല്‍ സമര്‍പ്പിക്കണം, അല്ലെങ്കില്‍ ക്ളിയര്‍ എന്ന ചെക്ബോക്സ് ടിക് ചെയ്യണം. ദയവായി രണ്ടും " "കൂടി ചെയ്യരുത്." -#: 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." @@ -711,21 +751,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 "" @@ -733,40 +777,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 " @@ -775,29 +826,29 @@ "%(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 "" -#: 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 " @@ -806,15 +857,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 "കാലിയാക്കുക" @@ -830,63 +881,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 "ഉച്ച" @@ -1162,117 +1213,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." @@ -1281,7 +1348,7 @@ "%(class_name)s.allow_future ന് False എന്നു നല്കിയിട്ടുള്ളതിനാല്‍ Future " "%(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 "'%(datestr)s' എന്ന തെറ്റായ തീയതി '%(format)s' എന്ന മാതൃകയില്‍." @@ -1291,17 +1358,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 "" "പേജ് നമ്പറായി സംഖ്യയാക്കി മാറ്റാന്‍ കഴിയുന്ന മൂല്യമോ '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 എന്നത് 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/mn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/mn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/mn/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/mn/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/mn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/mn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,22 +1,23 @@ # This file is distributed under the same license as the Django package. # # Translators: -# ankhaa1002 , 2013 +# Ankhbayar , 2013 +# Bayarkhuu Bataa, 2014 # Jacara , 2011 # Jannis Leidel , 2011 # jargalan , 2011 # Tsolmon , 2011 -# zorig , 2013 -# Анхбаяр Анхаа , 2013 +# Zorig , 2013-2014 +# Анхбаяр Анхаа , 2013-2014 # Баясгалан Цэвлээ , 2011 # Ганзориг БП , 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-30 18:45+0000\n" -"Last-Translator: zorig \n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-08-26 03:33+0000\n" +"Last-Translator: Bayarkhuu Bataa\n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/django/" "language/mn/)\n" "MIME-Version: 1.0\n" @@ -34,6 +35,10 @@ msgstr "Араб" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Азербажан" @@ -86,321 +91,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 "Венесуэлийн Спани" -#: 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 "Interlingua" -#: 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 "Зөв email хаяг оруулна уу" +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 " @@ -415,7 +448,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 " @@ -430,259 +463,255 @@ "Ensure this value has at most %(limit_value)d characters (it has " "%(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 "%(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 буруу сонголт байна." +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 "%(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 "'%(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 "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 "" -"'%(value)s' утга буруу форматтай байна. Формат нь YYYY-MM-DD байх хэрэгтэй." +msgstr "'%(value)s' нь буруу байна. Энэ нь ОООО-СС-ӨӨ форматтай байх ёстой." -#: 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) байх хэрэгтэй." +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 "'%(value)s' заавал decimal утга байх." -#: 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' заавал 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 утга авах." +msgstr "" -#: 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 "Слаг (ихдээ %(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 "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 модель байхгүй байна" +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] "%(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." @@ -691,31 +720,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 "" @@ -725,13 +754,13 @@ msgstr[1] "" "Ensure this filename has at most %(max)d characters (it has %(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." @@ -739,21 +768,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" @@ -761,42 +794,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 "УдирдахФормын мэдээлэл олдсонгүй эсвэл өөрчлөгдсөн байна" +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: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 " @@ -805,31 +845,31 @@ "%(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 "" "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\" нь primary key талбарт тохирохгүй утга байна." -#: 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 " @@ -838,15 +878,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 "Цэвэрлэх" @@ -862,63 +902,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 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 "шөнө дунд" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "үд дунд" @@ -1194,117 +1234,133 @@ msgid "December" msgstr "Гахай" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Пиллов, Пил аль аль нь дуудах боломжгүй: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "_imaging -н модель ПИЛ %s дуудагдах боломжгүй " - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." -msgstr "Зөв IPv6 хаяг оруулна уу." +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/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 "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." @@ -1313,7 +1369,7 @@ "%(class_name)s.allow_future нь худлаа учраас %(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 "" @@ -1324,17 +1380,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 "Хуудас нь '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 ийн жагсаалт" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/mr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/mr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/mr/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/mr/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/mr/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/mr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,1372 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Suraj Kawade, 2013 +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: Marathi (http://www.transifex.com/projects/p/django/language/" +"mr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: mr\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 "" + +#: core/validators.py:77 forms/fields.py:675 +msgid "Enter a valid URL." +msgstr "" + +#: 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 "" + +#: core/validators.py:188 core/validators.py:207 +msgid "Enter a valid IPv4 address." +msgstr "" + +#: 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 "" + +#: 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 "" + +#: 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 "" + +#. 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 "" + +#: forms/fields.py:236 +msgid "Enter a whole number." +msgstr "" + +#: forms/fields.py:279 forms/fields.py:316 +msgid "Enter a number." +msgstr "" + +#: 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 "" + +#: forms/fields.py:461 forms/fields.py:1140 +msgid "Enter a valid time." +msgstr "" + +#: forms/fields.py:483 +msgid "Enter a valid date/time." +msgstr "" + +#: forms/fields.py:564 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "" + +#: forms/fields.py:565 +msgid "No file was submitted." +msgstr "" + +#: forms/fields.py:566 +msgid "The submitted file is empty." +msgstr "" + +#: 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 "" + +#: 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: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: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 "" + +#: 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 "" + +#: 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 "" + +#: 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 "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/my/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/my/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/my/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/my/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/my/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/my/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,10 +4,10 @@ # Yhal Htet Aung , 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:51+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/" "my/)\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 "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 -msgid "Icelandic" +#: conf/global_settings.py:88 +msgid "Ido" msgstr "" #: conf/global_settings.py:88 -msgid "Italian" +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 " @@ -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 "ကိန်းပြည့်" -#: 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] "" -#: 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,83 +762,89 @@ #. 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 "" -#: 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 "" @@ -810,62 +860,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 "မွန်းတည့်" @@ -1141,118 +1191,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 "" @@ -1262,16 +1328,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/nb/formats.py python-django-1.7.4/django/conf/locale/nb/formats.py --- python-django-1.6.6/django/conf/locale/nb/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/nb/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' -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 # Kept ISO formats as they are in first position DATE_INPUT_FORMATS = ( - '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' + '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' # '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006' # '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006' # '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006' @@ -38,5 +38,5 @@ '%d.%m.%y', # '25.10.06' ) 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/nb/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/nb/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/nb/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/nb/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/nb/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/nb/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,22 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Alexander Hansen , 2014 +# Eirik Krogstad , 2014 # Jannis Leidel , 2011 -# jonklo , 2013 -# jonklo , 2011 +# jensadne , 2014 +# Jon , 2014 +# Jon , 2013 +# Jon , 2011 # Sigurd Gartmann , 2012 -# injectedreality , 2013 +# Tommy Strand , 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-02 16:41+0000\n" -"Last-Translator: jonklo \n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-09-05 12:01+0000\n" +"Last-Translator: jensadne \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -30,6 +34,10 @@ msgstr "Arabisk" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "Asturiansk" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Aserbajdsjansk" @@ -82,320 +90,348 @@ msgstr "Engelsk" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "Engelsk (australsk)" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Engelsk (britisk)" -#: 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 "Meksikansk 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 "Venezuelanske 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 "Galisisk" -#: 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 "Ido" + +#: 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 "Luxembourgsk" -#: 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 "Latvisk" -#: 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 "Malayalam" -#: 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 "Marathi" + +#: 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 "Nepali" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" msgstr "Nederlandsk" -#: 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 "Panjabi" -#: 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 "Rumensk" -#: 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 "Tradisjonell kinesisk" +#: contrib/sitemaps/apps.py:8 +msgid "Site Maps" +msgstr "Sidekart" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Statiske filer" + +#: contrib/syndication/apps.py:8 +msgid "Syndication" +msgstr "Syndikering" + +#: contrib/webdesign/apps.py:8 +msgid "Web Design" +msgstr "Web-design" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "Oppgi en gyldig verdi." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Oppgi en gyldig nettadresse." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Oppgi et gyldig heltall." +msgstr "Skriv inn et gyldig heltall." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Oppgi en gyldig e-postadresse" -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Oppgi en gyldig «slug» bestående av bokstaver, nummer, understreker eller " "bindestreker." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Oppgi 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 "Oppgi 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 "Oppgi 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 "Oppgi kun tall adskilt med komma." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Verdien må 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 "Verdien må være mindre enn eller lik %(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 "Verdien må være større enn eller lik %(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 " @@ -410,7 +446,7 @@ "Sørg for denne verdien har minst %(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 " @@ -424,259 +460,266 @@ "Sørg for denne verdien har %(limit_value)d eller færre tegn (den har nå " "%(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 må 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 %(field_label)s finnes allerede." +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s med denne %(field_labels)s finnes 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 "Verdien %(value)r er ikke et gyldig valg." -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Feltet kan ikke være tomt." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Feltet kan ikke være blankt." -#: 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 %(field_label)s finnes 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 må 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 av typen: %(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 "Heltall" -#: 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»-verdien må være et heltall." +msgstr "Verdien '%(value)s' må være et heltall." -#: 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»-verdien må være enten True eller False." +msgstr "Verdien '%(value)s' må 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 (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 "Tekst (opp til %(max_length)s tegn)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Heltall adskilt med komma" -#: 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»-verdien har et ugyldig datoformat. Det må være på formen YYYY-MM-" +"Verdien '%(value)s' har ugyldig datoformat. Den må 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»-verdien er på den korrekte formen (YYYY-MM-DD), men det er en " -"ugyldig dato." +"Verdien '%(value)s' har riktig 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 (uten 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»-verdien har et ugyldig datoformat. Det må være på formen YYYY-MM-" -"DD HH:MM[:ss[.uuuuuu]][TZ]." +"'%(value)s'-verdien har et ugyldig format. Det må være på formen 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»-verdien er på den korrekte formen (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"'%(value)s'-verdien er på den korrekte formen (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]), men er 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»-verdien må være et desimaltall." +msgstr "Verdien '%(value)s' må være et desimaltall." -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Desimaltall" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-postadresse" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Filsti" -#: 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»-verdien må være et flyttall." +msgstr "Verdien '%(value)s' må være et flyttall." -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Flyttall" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Stort (8 byte) heltall" -#: 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»-verdien må være enten None, True eller False." +msgstr "Verdien '%(value)s' må 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 heltall" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Positivt lite heltall" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (opp til %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Lite heltall" -#: 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»-verdien har et ugyldig format. Det må være på formen HH:MM[:ss[." +"Verdien '%(value)s' er i et ugyldig format. Formatet må være 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»-verdien er på den korrekte formen (HH:MM[:ss[.uuuuuu]]), men er " -"et ugyldig tidspunkt." +"Verdien '%(value)s' har riktig format (HH:MM[:ss[.uuuuuu]]), men er ikke et " +"gyldig klokkeslett." -#: 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 "Nettadresse" -#: db/models/fields/__init__.py:1384 +#: db/models/fields/__init__.py:2000 msgid "Raw binary data" msgstr "Rå binærdata" -#: 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 "Bilde" -#: 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økkelen %(pk)r finnes ikke." -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Fremmednøkkel (type bestemmes av relatert felt)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "En-til-en-relasjon" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Mange-til-mange-relasjon" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Feltet er påkrevet." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Oppgi et heltall." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Oppgi et tall." -#: 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] "Sørg for at det er kun %(max)s tall." msgstr[1] "Sørg for at det er %(max)s eller færre tall totalt." -#: 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] "Sørg for at det er kun %(max)s desimal." msgstr[1] "Sørg for at det er %(max)s eller færre desimaler." -#: 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 +728,31 @@ msgstr[0] "Sørg for at det kun %(max)s tall før desimalpunkt." msgstr[1] "Sørg for at det er %(max)s eller færre tall før desimalpunkt." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Oppgi 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 "Oppgi et gyldig tidspunkt." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Oppgi gyldig dato og tidspunkt." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Ingen fil ble sendt. Sjekk «encoding»-typen på skjemaet." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Ingen fil ble sendt." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Filen 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 "" @@ -718,11 +761,11 @@ msgstr[1] "" "Sørg for at filnavnet har færre enn %(max)d tegn (det har nå %(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Vennligst last opp en ny fil eller marker fjern-boksen, ikke begge." -#: 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,21 +773,25 @@ "Last opp et gyldig bilde. Filen du lastet opp var ødelagt eller ikke et " "bilde." -#: 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 "Velg et gyldig valg. %(value)s er ikke et av de tilgjengelige valgene." -#: 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 "Oppgi en liste med verdier." +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "Skriv inn en fullstendig verdi." + #. 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" @@ -752,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 har blitt tuklet med" +msgstr "ManagementForm-data mangler eller har blitt endret." -#: 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] "Vennligst oppgi %d skjema." msgstr[1] "Vennligst oppgi %d eller færre skjema." -#: 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] "Vennligst send inn %d eller flere skjemaer." +msgstr[1] "Vennligst send inn %d eller flere skjemaer." + +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "Rekkefølge" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Slett" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Vennligst korriger dupliserte 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 "Vennligst korriger dupliserte data for %(field)s, som må være unike." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -794,30 +848,30 @@ "Vennligst korriger dupliserte data for %(field_name)s, som må være unike for " "%(lookup)s i %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Vennligst korriger de dupliserte verdiene nedenfor." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "Primærnøkkelen er ikke den samme som foreldreinstansens primærnøkkel." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Velg et gyldig valg. Valget er ikke av de tilgjengelige valgene." -#: 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 verdi for en primærnøkkel." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Hold nede «Control», eller «Command» på en Mac, for å velge mer enn en." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -826,15 +880,15 @@ "%(datetime)s kunne ikke tolkes i tidssonen %(current_timezone)s, det kan " "være tvetydig eller ikke eksistere." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Nåværende" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Endre" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Fjern" @@ -850,63 +904,63 @@ msgid "No" msgstr "Nei" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "ja,nei,kanskje" -#: 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" -#: 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 "midnatt" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "12:00" @@ -1182,117 +1236,147 @@ msgid "December" msgstr "Desember" -#: 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 "'_imaging' modulen for PIL 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 "," +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 uke" msgstr[1] "%d uker" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dager" -#: 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 minutt" 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 "Mappeinnhold er ikke tillatt her." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Forbudt" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "CSRF-verifisering feilet. Forespørsel avbrutt." -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "«%(path)s» finnes 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 meldingen fordi dette HTTPS-nettstedet krever en 'Referer'-" +"header for å bli sendt av nettleseren, men ingen ble sendt. Denne headeren " +"er nødvendig av sikkerhetsmessige årsaker, for å sikre at nettleseren din " +"ikke blir kapret av tredjeparter." -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Innhold i %(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 konfigurert nettleseren din til å deaktivere 'Referer'-headers, " +"kan du aktivere dem, i hvert fall for dette nettstedet, eller for HTTPS-" +"tilkoblinger, eller for 'same-origin'-forespørsler." + +#: 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 meldingen fordi denne nettsiden krever en CSRF-cookie når du " +"sender inn skjemaer. Denne informasjonskapselen er nødvendig av " +"sikkerhetsmessige årsaker, for å sikre at nettleseren din ikke blir kapret " +"av tredjeparter." + +#: 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 konfigurert nettleseren din til å deaktivere " +"informasjonskapsler, kan du aktivere dem, i hvert fall for dette nettstedet, " +"eller for 'same-origin'-forespørsler." + +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "Mer informasjon er tilgjengelig med DEBUG=True." -#: views/generic/dates.py:42 +#: views/generic/dates.py:43 msgid "No year specified" msgstr "År ikke spesifisert" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Måned ikke spesifisert" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Dag ikke spesifisert" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Uke ikke spesifisert" -#: 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 tilgjengelig" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1301,7 +1385,7 @@ "Fremtidig %(verbose_name_plural)s ikke tilgjengelig fordi %(class_name)s." "allow_future er False." -#: 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» gitt formatet «%(format)s»" @@ -1311,16 +1395,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Fant ingen %(verbose_name)s som passet spørringen" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Siden er ikke «last», og kan heller ikke konverteres til et tall." -#: 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 False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Mappeinnhold er ikke tillatt her." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "«%(path)s» finnes ikke" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Innhold i %(directory)s" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ne/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ne/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/ne/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ne/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/ne/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ne/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Jannis Leidel , 2014 # Paras Nath Chaudhary , 2012 # Sagar Chalise , 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-10-02 17:03+0000\n" -"Last-Translator: Sagar Chalise \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: Nepali (http://www.transifex.com/projects/p/django/language/" "ne/)\n" "MIME-Version: 1.0\n" @@ -27,6 +28,10 @@ msgstr "अरबिक" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "अजरबैजानी" @@ -79,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 "" +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 "" +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 +#: 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 "" +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 "" +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 "उपयुक्त आइ.पी.६ ठेगाना राख्नुहोस ।" -#: 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 " @@ -405,7 +438,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 " @@ -420,247 +453,255 @@ "यो मान बढिमा पनि %(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 "" +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 "%(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 "'%(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 "" +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 "" -#: 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 "" -#: 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 "" +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]] " "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] "जम्मा %(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." @@ -669,31 +710,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 "" @@ -705,11 +746,11 @@ "यो फाइलको नाममा बढी मा %(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." @@ -717,21 +758,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" @@ -739,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] "कृपया %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 " @@ -781,44 +833,44 @@ "कृपया %(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\" अथवा \"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 "सबै खाली गर्नु होस ।" @@ -834,63 +886,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 "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 "मध्यान्ह" @@ -1166,117 +1218,133 @@ msgid "December" msgstr "डिसम्वर" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "PIL अथवा Pillow, कुनै पनो आयात गर्न सकिएन : %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 होइन ।" +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 वर्ष" 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 "० मिनट" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "निषेधित" + +#: 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\" नभएको पाइयो ।" +#: 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" +#: 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." @@ -1285,7 +1353,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'" @@ -1295,16 +1363,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' '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 "" diff -Nru python-django-1.6.6/django/conf/locale/nl/formats.py python-django-1.7.4/django/conf/locale/nl/formats.py --- python-django-1.6.6/django/conf/locale/nl/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/nl/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -18,6 +18,7 @@ # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior DATE_INPUT_FORMATS = ( '%d-%m-%Y', '%d-%m-%y', # '20-01-2009', '20-01-09' + '%d/%m/%Y', '%d/%m/%y', # '20/01/2009', '20/01/09' # '%d %b %Y', '%d %b %y', # '20 jan 2009', '20 jan 09' # '%d %B %Y', '%d %B %y', # '20 januari 2009', '20 januari 09' ) @@ -33,26 +34,33 @@ DATETIME_INPUT_FORMATS = ( # With time in %H:%M:%S : '%d-%m-%Y %H:%M:%S', '%d-%m-%y %H:%M:%S', '%Y-%m-%d %H:%M:%S', # '20-01-2009 15:23:35', '20-01-09 15:23:35', '2009-01-20 15:23:35' + '%d/%m/%Y %H:%M:%S', '%d/%m/%y %H:%M:%S', '%Y/%m/%d %H:%M:%S', # '20/01/2009 15:23:35', '20/01/09 15:23:35', '2009/01/20 15:23:35' # '%d %b %Y %H:%M:%S', '%d %b %y %H:%M:%S', # '20 jan 2009 15:23:35', '20 jan 09 15:23:35' # '%d %B %Y %H:%M:%S', '%d %B %y %H:%M:%S', # '20 januari 2009 15:23:35', '20 januari 2009 15:23:35' # With time in %H:%M:%S.%f : '%d-%m-%Y %H:%M:%S.%f', '%d-%m-%y %H:%M:%S.%f', '%Y-%m-%d %H:%M:%S.%f', # '20-01-2009 15:23:35.000200', '20-01-09 15:23:35.000200', '2009-01-20 15:23:35.000200' + '%d/%m/%Y %H:%M:%S.%f', '%d/%m/%y %H:%M:%S.%f', '%Y/%m/%d %H:%M:%S.%f', # '20/01/2009 15:23:35.000200', '20/01/09 15:23:35.000200', '2009/01/20 15:23:35.000200' # With time in %H.%M:%S : '%d-%m-%Y %H.%M:%S', '%d-%m-%y %H.%M:%S', # '20-01-2009 15.23:35', '20-01-09 15.23:35' + '%d/%m/%Y %H.%M:%S', '%d/%m/%y %H.%M:%S', # '20/01/2009 15.23:35', '20/01/09 15.23:35' # '%d %b %Y %H.%M:%S', '%d %b %y %H.%M:%S', # '20 jan 2009 15.23:35', '20 jan 09 15.23:35' # '%d %B %Y %H.%M:%S', '%d %B %y %H.%M:%S', # '20 januari 2009 15.23:35', '20 januari 2009 15.23:35' # With time in %H.%M:%S.%f : '%d-%m-%Y %H.%M:%S.%f', '%d-%m-%y %H.%M:%S.%f', # '20-01-2009 15.23:35.000200', '20-01-09 15.23:35.000200' + '%d/%m/%Y %H.%M:%S.%f', '%d/%m/%y %H.%M:%S.%f', # '20/01/2009 15.23:35.000200', '20/01/09 15.23:35.000200' # With time in %H:%M : '%d-%m-%Y %H:%M', '%d-%m-%y %H:%M', '%Y-%m-%d %H:%M', # '20-01-2009 15:23', '20-01-09 15:23', '2009-01-20 15:23' + '%d/%m/%Y %H:%M', '%d/%m/%y %H:%M', '%Y/%m/%d %H:%M', # '20/01/2009 15:23', '20/01/09 15:23', '2009/01/20 15:23' # '%d %b %Y %H:%M', '%d %b %y %H:%M', # '20 jan 2009 15:23', '20 jan 09 15:23' # '%d %B %Y %H:%M', '%d %B %y %H:%M', # '20 januari 2009 15:23', '20 januari 2009 15:23' # With time in %H.%M : '%d-%m-%Y %H.%M', '%d-%m-%y %H.%M', # '20-01-2009 15.23', '20-01-09 15.23' + '%d/%m/%Y %H.%M', '%d/%m/%y %H.%M', # '20/01/2009 15.23', '20/01/09 15.23' # '%d %b %Y %H.%M', '%d %b %y %H.%M', # '20 jan 2009 15.23', '20 jan 09 15.23' # '%d %B %Y %H.%M', '%d %B %y %H.%M', # '20 januari 2009 15.23', '20 januari 2009 15.23' # Without time : '%d-%m-%Y', '%d-%m-%y', '%Y-%m-%d', # '20-01-2009', '20-01-09', '2009-01-20' + '%d/%m/%Y', '%d/%m/%y', '%Y/%m/%d', # '20/01/2009', '20/01/09', '2009/01/20' # '%d %b %Y', '%d %b %y', # '20 jan 2009', '20 jan 09' # '%d %B %Y', '%d %B %y', # '20 januari 2009', '20 januari 2009' ) Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/nl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/nl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/nl/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/nl/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/nl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/nl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,18 +4,20 @@ # Bas Peschier , 2011,2013 # Blue , 2011-2012 # Bouke Haarsma , 2013 -# erikr , 2013 +# Claude Paroz , 2014 +# Erik Romijn , 2013 # Harro van der Klauw , 2011-2012 # Jannis Leidel , 2011 -# Jeffrey Gelens , 2011-2012 +# Jeffrey Gelens , 2011-2012,2014 +# Michiel Overtoom , 2014 # Tino de Bruijn , 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-22 07:48+0000\n" -"Last-Translator: Bouke Haarsma \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: Dutch (http://www.transifex.com/projects/p/django/language/" "nl/)\n" "MIME-Version: 1.0\n" @@ -33,6 +35,10 @@ msgstr "Arabisch" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbaijani" @@ -85,322 +91,350 @@ msgstr "Engels" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Brits-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 "Argentijns-Spaans" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Mexicaans Spaans" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Nicaraguaans Spaans" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Venezolaans Spaans" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Ests" -#: 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 "Perzisch" -#: 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 "Frans" -#: 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 "Galicisch" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebreews" -#: 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 "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 "Indonesisch" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "IJslands" -#: 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 "Japans" -#: 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 "Kazachs" -#: 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 "Koreaans" -#: 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 "Litouws" -#: 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 "Macedonisch" -#: 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 "" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "Birmaans" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Noorse Bokmål" -#: 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 "Noorse 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 "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 "Braziliaans 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 "Russisch" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slovaaks" -#: 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 "Albanisch" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Servisch" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Servisch Latijn" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Zweeds" -#: 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 "Telegu" -#: conf/global_settings.py:122 +#: conf/global_settings.py:123 msgid "Thai" msgstr "Thais" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Turks" -#: 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 "Vietnamees" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Vereenvoudigd Chinees" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Traditioneel Chinees" +#: 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 "Geef een geldige waarde." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Geef een geldige URL op." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Geef een geldig geheel getal op." +msgstr "" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Vul een geldig emailadres in." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Vul een geldigde 'slug' in, bestaande uit letters, cijfers, liggende " "streepjes en verbindingsstreepjes." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Geef een geldig IPv4-adres op." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Voer een geldig 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 een geldig 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 "Geef alleen cijfers op, gescheiden door komma's." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" "Zorg ervoor dat deze waarde gelijk is aan %(limit_value)s (het is nu " "%(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 "Zorg ervoor dat deze waarde hoogstens %(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 "Zorg ervoor dat deze waarde minstens %(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 " @@ -415,7 +449,7 @@ "Zorg dat deze waarde ten minste %(limit_value)d tekens bevat (het zijn er nu " "%(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 " @@ -430,259 +464,255 @@ "Zorg dat deze waarde niet meer dan %(limit_value)d tekens bevat (het zijn er " "nu %(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 zijn voor %(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 "Er bestaat al een %(model_name)s met eenzelfde %(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 "Waarde %(value)r is geen geldige keuze." +msgstr "" -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Dit veld mag niet leeg zijn." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Dit veld kan niet leeg zijn" -#: 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 "Er bestaat al een %(model_name)s met eenzelfde %(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 "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 "Geheel getal" -#: 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' waarde moet een geheel getal zijn." +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' waarde moet True of False zijn." +msgstr "" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Boolean (True danwel False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Karakterreeks (hooguit %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Komma-gescheiden gehele getallen" -#: 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 heeft een ongeldig datumformaat. Het juiste formaat is " -"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' waarde heeft een correct formaat (YYYY-MM-DD), maar is echter " -"geen geldige datum." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Datum (zonder tijd)" -#: 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 heeft een ongeldig formaat. Het juiste formaat is 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' waarde heeft een geldig formaat (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]), maar is een ongeldige datum/tijd." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Datum (met tijd)" -#: 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' waarde moet een decimaal getal zijn." +msgstr "" -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Decimaal getal" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-mailadres" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Bestandspad" -#: 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' waarde moet een float zijn." +msgstr "" -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Decimaal getal" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Groot (8 byte) geheel getal" -#: 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-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 "'%(value)s' waarde moet None, True of False zijn." +msgstr "" -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "Boolean (True, False of None)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Positief geheel getal" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Postitief klein geheel getal" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (max. lengte %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Klein geheel getal" -#: 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' waarde heeft een ongeldig formaat. Het juiste formaat is 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' waarde heeft het juiste formaat (HH:MM[:ss[.uuuuuu]]), maar is " -"een ongeldige tijd." -#: db/models/fields/__init__.py:1299 +#: db/models/fields/__init__.py:1898 msgid "Time" msgstr "Tijd" -#: 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 "Ruwe binaire data" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Bestand" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Plaatje" -#: 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-instantie met pk %(pk)r bestaat niet." +msgstr "" -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Refererende sleutel (type wordt bepaalde door gerelateerde veld)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Één-op-één relatie" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Veel-op-veel relatie" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Dit veld is verplicht." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Geef een geheel getal op." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Geef een getal op." -#: 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] "Zorg dat er niet meer dan %(max)s cijfer is." msgstr[1] "Zorg dat er niet meer dan %(max)s cijfers zijn." -#: 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] "Zorg dat er niet meer dan %(max)s cijfer achter de komma staat." msgstr[1] "Zorg dat er niet meer dan %(max)s cijfers achter de komma staan." -#: 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." @@ -691,33 +721,33 @@ msgstr[0] "Zorg dat er niet meer dan %(max)s cijfer voor de komma staat." msgstr[1] "Zorg dat er niet meer dan %(max)s cijfers voor de komma staan." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Geef een geldige datum op." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Geef een geldige tijd op." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Geef een geldige datum/tijd op." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "Er was geen bestand verstuurd. Controleer het coderingstype van het " "formulier." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Er was geen bestand verstuurd." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Het verstuurde bestand 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 "" @@ -729,11 +759,11 @@ "Zorg dat deze bestandsnaam niet meer dan %(max)d tekens bevat (het zijn er " "nu %(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Upload a.u.b. een bestand of vink de verwijder vink, niet allebei." -#: 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." @@ -741,21 +771,25 @@ "Bestand ongeldig. Het bestand dat is gegeven is geen afbeelding of is " "beschadigd." -#: 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 "Selecteer een geldige keuze. %(value)s is geen beschikbare keuze." -#: 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 "Geef een lijst op met waardes." +#: 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 "(Verborgen veld %(name)s) %(error)s" @@ -763,40 +797,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 "Gegevens van ManagementForm ontbreken of zijn onrechtmatig gewijzigd" +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] "Verstuur niet meer dan %d formulier." msgstr[1] "Verstuur niet meer dan %d formulieren." -#: 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 "Volgorde" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Verwijderen" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Verbeter de dubbele gegevens voor %(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 "Verbeter de dubbele gegevens voor %(field)s, welke uniek moet zijn." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -805,33 +846,33 @@ "Verbeter de dubbele gegevens voor %(field_name)s, welke uniek moet zijn voor " "de %(lookup)s in %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Verbeter de dubbele waarden hieronder." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "De secundaire sleutel komt niet overeen met de primaire sleutel van de " "bovenliggende instantie." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Selecteer een geldige keuze. Deze keuze is niet beschikbaar." -#: 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\" is geen geldige waarde voor een primaire sleutel." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Houd \"Control\", of \"Command\" op een Mac, ingedrukt om meerdere te " "selecteren." -#: 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 +881,15 @@ "%(datetime)s kon niet worden geïnterpreteerd in tijdzone " "%(current_timezone)s. Waarschijnlijk is deze ambigu of bestaat niet." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Huidige" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Wijzigen" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Verwijder" @@ -864,63 +905,63 @@ msgid "No" msgstr "Nee" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "ja,nee,misschien" -#: 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 "middernacht" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "middag" @@ -1169,7 +1210,7 @@ #: utils/dates.py:51 msgctxt "alt. month" msgid "July" -msgstr "july" +msgstr "juli" #: utils/dates.py:52 msgctxt "alt. month" @@ -1196,117 +1237,133 @@ msgid "December" msgstr "december" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Zowel Pillow als PIL konden niet geïmporteerd worden: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "De '_imaging'-module voor PIL kon niet geïmporteerd worden: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." -msgstr "Dit is geen geldig IPv6-adres." +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 "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 "," +msgstr ", " -#: utils/timesince.py:24 +#: utils/timesince.py:25 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d jaar" msgstr[1] "%d jaren" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d maand" msgstr[1] "%d maanden" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d week" msgstr[1] "%d weken" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagen" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d uur" msgstr[1] "%d uren" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minuut" 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 "Directory overzicht is hier niet toegestaan" +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" bestaat niet" +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Overzicht van %(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 "Geen jaar opgegeven" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Geen maand opgegeven" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Geen dag opgegeven" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Geen week opgegeven" -#: 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 beschikbaar" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1315,7 +1372,7 @@ "Geen toekomstige %(verbose_name_plural)s beschikbaar omdat %(class_name)s." "allow_future de waarde False (Onwaar) heeft." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "Ongeldige datum tekst '%(datestr)s' op basis van formaat '%(format)s'" @@ -1325,18 +1382,32 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Geen %(verbose_name)s gevonden die voldoet aan de 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 "" "Pagina is niet 'last' en kan ook niet geconverteerd worden naar een int." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Ongeldige pagina (%(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 "" "Lege lijst en %(class_name)s.allow_empty heeft de waarde False (Onwaar)." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Directory overzicht is hier niet toegestaan" + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" bestaat niet" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Overzicht van %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/nn/formats.py python-django-1.7.4/django/conf/locale/nn/formats.py --- python-django-1.6.6/django/conf/locale/nn/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/nn/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' -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 # Kept ISO formats as they are in first position DATE_INPUT_FORMATS = ( - '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' + '%Y-%m-%d', '%d.%m.%Y', '%d.%m.%y', # '2006-10-25', '25.10.2006', '25.10.06' # '%d. %b %Y', '%d %b %Y', # '25. okt 2006', '25 okt 2006' # '%d. %b. %Y', '%d %b. %Y', # '25. okt. 2006', '25 okt. 2006' # '%d. %B %Y', '%d %B %Y', # '25. oktober 2006', '25 oktober 2006' @@ -39,5 +39,5 @@ '%d.%m.%y', # '25.10.06' ) 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/nn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/nn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/nn/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/nn/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/nn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/nn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # velmont , 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-11-06 15:25+0000\n" -"Last-Translator: jensadne \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: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/" "language/nn/)\n" "MIME-Version: 1.0\n" @@ -30,6 +30,10 @@ msgstr "Arabisk" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Aserbajansk" @@ -82,320 +86,348 @@ msgstr "Engelsk" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Engelsk (britisk)" -#: 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 "Spansk (argentinsk)" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Spansk (meksikansk)" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Spansk (nicaraguansk)" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Spansk (venezuelansk)" -#: 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 "Galisisk" -#: 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 "" -#: 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 "Luxembourgsk" -#: 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 "Latvisk" -#: 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 "Malayalam" -#: 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 "Nepali" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" msgstr "Nederlandsk" -#: 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 "Rumensk" -#: 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 "Simplifisert kinesisk" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Tradisjonell kinesisk" +#: 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 "Oppgje ein gyldig verdi." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Oppgje ei gyldig nettadresse." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Oppgje eit gyldig heiltal" +msgstr "" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Oppgje ei gyldig e-postadresse." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Oppgje ein gyldig 'slug' som består av bokstavar, nummer, understrekar eller " "bindestrekar." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Oppgje ei 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 "Skriv inn ei 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 "Skriv inn ei 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 "Oppgje berre tall skild med komma." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Verdien må minimum ha %(limit_value)s teikn (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 "Verdien må vere mindre enn eller lik %(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 "Verdien må vere større enn eller lik %(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 @@ msgstr[0] "Verdien må ha minst %(limit_value)d teikn (den har %(show_value)d)." msgstr[1] "Verdien må ha minst %(limit_value)d teikn (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 " @@ -417,247 +449,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 må vere 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 %(field_label)s fins allereie." +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 "Feltet kan ikkje vere tomt." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Feltet kan ikkje vere 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 %(field_label)s fins allereie." + +#. 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 "Felt av typen: %(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 "Heiltal" -#: 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 "Verdien '%(value)s' må vere eit heiltal." +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 "Verdien '%(value)s' må vere anten True eller False." +msgstr "" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Boolsk (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 "Tekst (opp til %(max_length)s teikn)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Heiltal skild med komma" -#: 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 "Dato (utan 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 "" -#: 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 "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 "" -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Desimaltall" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-postadresse" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Filsti" -#: 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 "Flyttall" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Stort (8 bitar) heiltal" -#: 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 "" -#: 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 heiltal" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Positivt lite heiltal" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (opp til %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Lite heiltal" -#: 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 "Tid" -#: db/models/fields/__init__.py:1368 +#: db/models/fields/__init__.py:1977 msgid "URL" msgstr "Nettadresse" -#: 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 "Fil" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Bilete" -#: 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 "Primærnøkkel (type bestemt av relatert felt)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Ein-til-ein-forhold" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Mange-til-mange-forhold" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Feltet er påkravd." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Oppgje eit heiltall." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Oppgje eit tall." -#: 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 +706,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 "Oppgje ein gyldig dato." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Oppgje eit gyldig tidspunkt." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Oppgje gyldig dato og tidspunkt." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Inga fil vart sendt. Sjekk \"encoding\"-typen på skjemaet." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Inga fil vart sendt." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Fila 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 "" @@ -698,11 +738,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 "Last enten opp ei fil eller huk av i avkryssingsboksen." -#: 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,22 +750,26 @@ "Last opp eit gyldig bilete. Fila du lasta opp var ødelagt eller ikkje eit " "bilete." -#: 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 "" "Velg eit gyldig valg. %(value)s er ikkje eit av dei tilgjengelege valga." -#: 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 "Oppgje ei liste med verdiar." +#: 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 "" @@ -733,40 +777,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 "Rekkefølge" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Slett" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Korriger dupliserte 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 "Korriger dupliserte data for %(field)s, som må vere unike." -#: 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,32 +826,32 @@ "Korriger dupliserte data for %(field_name)s, som må vere unike for " "%(lookup)s i %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Korriger dei dupliserte verdiane nedanfor." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "Primærnøkkelen er ikkje den samme som foreldreinstansen sin primærnøkkel." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Velg eit gyldig valg. Valget er ikkje eit av dei tilgjengelege valga." -#: 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 "" "Hald nede \"Control\", eller \"Command\" på ein Mac, for å velge meir enn " "éin." -#: 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 +860,15 @@ "%(datetime)s kunne ikkje bli tolka i tidssona %(current_timezone)s. Verdien " "er anten tvetydig eller ugyldig." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Noverande" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Endre" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Tøm" @@ -833,63 +884,63 @@ msgid "No" msgstr "Nei" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "ja,nei,kanskje" -#: 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 "midnatt" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "12:00" @@ -1165,117 +1216,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 "Dette er ikkje ei gyldig IPv6-adresse." +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 "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ånad" msgstr[1] "%d månader" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d veke" msgstr[1] "%d veker" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagar" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d time" msgstr[1] "%d timar" -#: 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 minutt" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Mappeindeksar er ikkje tillate her." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "«%(path)s» finst ikkje." +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Indeks for %(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 "Årstal ikkje spesifisert" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Månad ikkje spesifisert" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Dag ikkje spesifisert" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Veke ikkje spesifisert" -#: 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 tilgjengeleg" -#: 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 +1351,7 @@ "Framtidig %(verbose_name_plural)s er ikkje tilgjengeleg fordi %(class_name)s." "allow_future er sett til False." -#: 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' gitt format '%(format)s'" @@ -1294,16 +1361,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Fann ingen %(verbose_name)s som korresponderte med spørringa" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Sida er ikkje 'last' og kan heller ikkje konverterast til eit tal." -#: 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 "Tom liste og '%(class_name)s.allow_empty' er False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Mappeindeksar er ikkje tillate her." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "«%(path)s» finst ikkje." + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Indeks for %(directory)s" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/os/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/os/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/os/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/os/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/os/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/os/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Soslan Khubulov , 2013 -# Soslan Khubulov , 2013 +# Xwybylty Soslan , 2013 +# Xwybylty Soslan , 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: Ossetic (http://www.transifex.com/projects/p/django/language/" "os/)\n" @@ -27,6 +27,10 @@ msgstr "Араббаг" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Тӕтӕйраг" @@ -79,320 +83,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 "Раст email адрис бафысс." -#: 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 " @@ -407,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 " @@ -422,247 +454,255 @@ "Дӕ хъус бадар цӕмӕй ам %(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 "Булон (Бӕлвырд кӕнӕ Мӕнг)" -#: 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 "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] "Дӕ хъус бадар цӕмӕй иууыл иумӕ %(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 +713,31 @@ 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 "" @@ -709,13 +749,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." @@ -723,21 +763,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" @@ -745,40 +789,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 " @@ -787,30 +838,30 @@ "Дӕ хорзӕхӕй, %(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 "\"%(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 " @@ -819,15 +870,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 "Сыгъдӕг" @@ -843,63 +894,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 "ӕмбисбон" @@ -1175,117 +1226,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] "%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/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." @@ -1294,7 +1361,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' раст нӕу" @@ -1304,16 +1371,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-ы индекс" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/pa/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/pa/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/pa/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/pa/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/pa/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pa/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: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/" "language/pa/)\n" @@ -27,6 +27,10 @@ msgstr "ਅਰਬੀ" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "ਅਜ਼ਰਬਾਈਜਾਨੀ" @@ -79,318 +83,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 -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 "" -#: 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 " @@ -401,7 +433,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 " @@ -412,247 +444,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 "ਖੇਤਰ ਦੀ ਕਿਸਮ: %(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 "" -#: 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] "" 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." @@ -661,31 +701,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 "" @@ -693,31 +733,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 "" -#: 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,84 +769,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 "ਸਾਫ਼ ਕਰੋ" @@ -818,63 +869,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 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 "ਸ਼ਾਮ" -#: 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 "ਨੂਨ" @@ -1150,124 +1201,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] "%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." +#: 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/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 "" @@ -1277,16 +1344,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 "\"%(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/pl/formats.py python-django-1.7.4/django/conf/locale/pl/formats.py --- python-django-1.6.6/django/conf/locale/pl/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pl/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,10 +22,10 @@ # '%d. %B %Y', '%d. %b. %Y', # '25. October 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', # '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' ) DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = ' ' Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/pl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/pl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/pl/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/pl/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/pl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,23 +1,32 @@ # This file is distributed under the same license as the Django package. # # Translators: +# sidewinder , 2014 # angularcircle, 2011,2013 +# angularcircle, 2011,2013 +# angularcircle, 2014 # Jannis Leidel , 2011 +# Janusz Harkot , 2014 # Kacper Krupa , 2013 # Karol , 2012 -# konryd , 2011 +# konryd , 2011 +# konryd , 2011 # Łukasz Rekucki , 2011 -# mpasternak , 2013 -# p , 2012 -# rczajka , 2013 +# Michał Pasternak , 2013 +# p , 2012 +# Piotr Meuś , 2014 +# p , 2012 +# Radek Czajka , 2013 +# Radek Czajka , 2013 # Roman Barczyński , 2012 +# sidewinder , 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 15:12+0000\n" -"Last-Translator: mpasternak \n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-09-18 19:35+0000\n" +"Last-Translator: angularcircle\n" "Language-Team: Polish (http://www.transifex.com/projects/p/django/language/" "pl/)\n" "MIME-Version: 1.0\n" @@ -36,6 +45,10 @@ msgstr "arabski" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "asturyjski" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "azerski" @@ -88,318 +101,346 @@ msgstr "angielski" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "Australijski Angielski" + +#: conf/global_settings.py:67 msgid "British English" msgstr "angielski brytyjski" -#: 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 "hiszpański" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "hiszpański argentyński" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "hiszpański meksykański" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "hiszpański nikaraguański" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "hiszpański wenezuelski" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "estoński" -#: 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 "perski" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "fiński" -#: 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 "fryzyjski" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "irlandzki" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "galicyjski" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "hebrajski" -#: 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 "chorwacki" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "węgierski" -#: 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 "indonezyjski" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "ido" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "islandzki" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "włoski" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "japoński" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "gruziński" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "kazachski" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "khmerski" -#: 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ński" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "luksemburski" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "litewski" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "łotewski" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "macedoński" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "malajski" -#: conf/global_settings.py:100 +#: conf/global_settings.py:101 msgid "Mongolian" msgstr "mongolski" -#: conf/global_settings.py:101 +#: conf/global_settings.py:102 +msgid "Marathi" +msgstr "marathi" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "birmański" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "norweski (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 "holenderski" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "norweski (Nynorsk)" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "osetyjski" -#: conf/global_settings.py:107 +#: conf/global_settings.py:108 msgid "Punjabi" msgstr "pendżabski" -#: conf/global_settings.py:108 +#: conf/global_settings.py:109 msgid "Polish" msgstr "polski" -#: 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 "brazylijski portugalski" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "rumuński" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "rosyjski" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "słowacki" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "słoweński" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "albański" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "serbski" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "serbski (łaciński)" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "szwedzki" -#: 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 "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 "tajski" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "turecki" -#: 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 "udmurcki" -#: conf/global_settings.py:126 +#: conf/global_settings.py:127 msgid "Ukrainian" msgstr "ukraiński" -#: 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 "wietnamski" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "chiński uproszczony" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "chiński tradycyjny" +#: contrib/sitemaps/apps.py:8 +msgid "Site Maps" +msgstr "Mapy stron" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Pliki statyczne" + +#: contrib/syndication/apps.py:8 +msgid "Syndication" +msgstr "Syndykacja treści" + +#: contrib/webdesign/apps.py:8 +msgid "Web Design" +msgstr "Projektowanie stron" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "Wpisz poprawną wartość." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Wpisz poprawny URL." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "" +msgstr "Wprowadź poprawną liczbę całkowitą." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Wprowadź poprawny adres email." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "To pole może zawierać jedynie litery, cyfry, podkreślenia i myślniki." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Wprowadź poprawny adres IPv4." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Wprowadź poprawny adres 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 "Wprowadź poprawny adres IPv4 lub 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 "Wpisz tylko cyfry oddzielone przecinkami." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Upewnij się, że ta wartość jest %(limit_value)s (jest %(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 "Upewnij się, że ta wartość jest mniejsza lub równa %(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 "Upewnij się, że ta wartość jest większa lub równa %(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 " @@ -417,7 +458,7 @@ "Upewnij się, że ta wartość ma przynajmniej %(limit_value)d znaków (obecnie " "ma %(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,238 +467,263 @@ "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" +"Upewnij się, że ta wartość ma przynajmniej %(limit_value)d znak (obecnie ma " +"%(show_value)d)." msgstr[1] "" +"Upewnij się, że ta wartość ma przynajmniej %(limit_value)d znaki (obecnie ma " +"%(show_value)d)." msgstr[2] "" +"Upewnij się, że ta wartość ma przynajmniej %(limit_value)d znaków (obecnie " +"ma %(show_value)d)." -#: db/models/base.py:884 -#, python-format -msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." -msgstr "" -"Wartości w %(field_name)s muszą być unikalne dla wyszukiwań %(lookup)s w " -"%(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 "%(field_label)s już istnieje w %(model_name)s." +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s z tymi %(field_labels)s już istnieje." -#: 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 "Wartość %(value)r nie jest poprawnym wyborem." -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "To pole nie może być puste." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "To pole nie może być puste." -#: 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 już istnieje w %(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 "" +"Wartość pola %(field_label)s musi być unikatowa dla %(date_field_label)s " +"%(lookup_type)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 "Liczba całkowita" -#: 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 "wartość '%(value)s' musi być liczbą całkowitą." -#: 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 "wartość '%(value)s' musi być True lub False." -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Wartość logiczna (True, False - prawda lub fałsz)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Łańcuch (do %(max_length)s znaków)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Liczby całkowite rozdzielone przecinkami" -#: 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 "" +"wartość '%(value)s' ma nieprawidłowy format. Musi być w formacie 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 "" +"wartość '%(value)s' ma prawidłowy format (YYYY-MM-DD), ale jest " +"nieprawidłową datą." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Data (bez godziny)" -#: 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 "" +"wartość '%(value)s' ma nieprawidłowy format. Musi być w formacie 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 "" +"wartość '%(value)s' ma prawidłowy format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"[TZ]), ale jest nieprawidłową datą/godziną." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Data (z godziną)" -#: 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 "wartość '%(value)s' musi być liczbą dziesiętną." -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Liczba dziesiętna" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "Adres e-mail" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Ścieżka do pliku" -#: db/models/fields/__init__.py:1029 +#: db/models/fields/__init__.py:1537 #, python-format msgid "'%(value)s' value must be a float." -msgstr "" +msgstr "wartość '%(value)s' musi być liczbą zmiennoprzecinkową." -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Liczba zmiennoprzecinkowa" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Duża liczba całkowita (8 bajtów)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "adres IPv4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "Adres 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 "wartość '%(value)s' musi być None, True lub False." -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "Wartość logiczna (True, False, None - prawda, fałsz lub nic)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Dodatnia liczba całkowita" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Dodatnia mała liczba całkowita" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (max. %(max_length)s znaków)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Mała liczba całkowita" -#: 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 "" +"wartość '%(value)s' ma nieprawidłowy format. Musi być w formacie 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 "" +"wartość '%(value)s' ma prawidłowy format (HH:MM[:ss[.uuuuuu]]), ale jest " +"nieprawidłową godziną." -#: db/models/fields/__init__.py:1299 +#: db/models/fields/__init__.py:1898 msgid "Time" msgstr "Czas" -#: 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 "Dane w postaci binarnej" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Plik" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Plik graficzny" -#: 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 %(model)s o kluczu głównym %(pk)r nie istnieje." -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Klucz obcy (typ określony przez pole powiązane)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Powiązanie jeden do jednego" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Powiązanie wiele do wiele" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "To pole jest wymagane." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Wpisz liczbę całkowitą." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Wpisz liczbę." -#: 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." @@ -665,62 +731,73 @@ msgstr[1] "Upewnij się, że jest nie więcej niż %(max)s cyfr." msgstr[2] "Upewnij się, że jest nie więcej niż %(max)s cyfr." -#: 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] "" +"Upewnij się, że liczba ma nie więcej niż %(max)s cyfrę po przecinku." msgstr[1] "" -msgstr[2] "" +"Upewnij się, że liczba ma nie więcej niż %(max)s cyfry po przecinku." +msgstr[2] "Upewnij się, że liczba ma nie więcej niż %(max)s cyfr po przecinku." -#: 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] "" +"Upewnij się, że liczba ma nie więcej niż %(max)s cyfrę przed przecinkiem." msgstr[1] "" +"Upewnij się, że liczba ma nie więcej niż %(max)s cyfry przed przecinkiem." msgstr[2] "" +"Upewnij się, że liczba ma nie więcej niż %(max)s cyfr przed przecinkiem." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Wpisz poprawną datę." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Wpisz poprawną godzinę." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Wpisz poprawną datę/godzinę." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Nie wysłano żadnego pliku. Sprawdź typ kodowania formularza." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Żaden plik nie został przesłany." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Wysłany plik jest pusty." -#: 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] "" +"Upewnij się, że nazwa pliku ma co najwyżej %(max)d znak (obecnie ma " +"%(length)d)." msgstr[1] "" +"Upewnij się, że nazwa pliku ma co najwyżej %(max)d znaki (obecnie ma " +"%(length)d)." msgstr[2] "" +"Upewnij się, że nazwa pliku ma co najwyżej %(max)d znaków (obecnie ma " +"%(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Prześlij plik lub zaznacz by usunąć, ale nie oba na raz." -#: 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 +805,26 @@ "Wgraj poprawny plik graficzny. Ten, który został wgrany, nie jest obrazem, " "albo jest uszkodzony." -#: 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 "" "Wybierz poprawną wartość. %(value)s nie jest jednym z dostępnych wyborów." -#: 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 "Podaj listę wartości." +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "Wprowadź kompletną wartość." + #. 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 "(Ukryte pole %(name)s) %(error)s" @@ -751,41 +832,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 "Brakuje danych ManagementForm lub zostały one zmodyfikowane." -#: 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[0] "Proszę wysłać %d lub mniej formularzy." +msgstr[1] "Proszę wysłać %d lub mniej formularze." +msgstr[2] "Proszę wysłać %d lub mniej formularzy." + +#: forms/formsets.py:339 +#, python-format +msgid "Please submit %d or more forms." +msgid_plural "Please submit %d or more forms." +msgstr[0] "Proszę wysłać %d lub więcej formularzy." +msgstr[1] "Proszę wysłać %d lub więcej formularze." +msgstr[2] "Proszę wysłać %d lub więcej formularzy." -#: forms/formsets.py:350 forms/formsets.py:352 +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "Porządek" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Usuń" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Popraw zduplikowane dane w %(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 "Popraw zduplikowane dane w %(field)s, które wymaga unikalności." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -794,31 +883,31 @@ "Popraw zduplikowane dane w %(field_name)s, które wymaga unikalności dla " "%(lookup)s w polu %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Popraw poniższe zduplikowane wartości." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "Osadzony klucz obcy nie pasuje do klucza głównego obiektu rodzica." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Wybierz poprawną wartość. Podana nie jest jednym z dostępnych wyborów." -#: forms/models.py:1147 +#: forms/models.py:1194 #, python-format msgid "\"%(pk)s\" is not a valid value for a primary key." msgstr "\"%(pk)s\" nie jest poprawną wartością klucza głównego." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Przytrzymaj wciśnięty klawisz \"Ctrl\" lub \"Command\" na Mac'u aby " "zaznaczyć więcej niż jeden wybór." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -827,15 +916,15 @@ "%(datetime)s nie może być interpretowany w strefie czasowej " "%(current_timezone)s; może być niejednoznaczne lub nie istnieć." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Teraz" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Zmień" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Wyczyść" @@ -851,11 +940,11 @@ msgid "No" msgstr "Nie" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "tak,nie,może" -#: 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" @@ -863,52 +952,52 @@ msgstr[1] "%(size)d bajty" msgstr[2] "%(size)d bajtów" -#: 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 południu" -#: utils/dateformat.py:48 +#: utils/dateformat.py:60 msgid "a.m." msgstr "rano" -#: utils/dateformat.py:53 +#: utils/dateformat.py:65 msgid "PM" msgstr "po południu" -#: utils/dateformat.py:54 +#: utils/dateformat.py:66 msgid "AM" msgstr "rano" -#: utils/dateformat.py:103 +#: utils/dateformat.py:149 msgid "midnight" msgstr "północ" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "południe" @@ -1184,36 +1273,26 @@ msgid "December" msgstr "grudnia" -#: 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 "To nie jest poprawny adres 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 "lub" #. 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" @@ -1221,7 +1300,7 @@ msgstr[1] "%d lata" msgstr[2] "%d lat" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1229,7 +1308,7 @@ msgstr[1] "%d miesiące" msgstr[2] "%d miesięcy" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1237,7 +1316,7 @@ msgstr[1] "%d tygodnie" msgstr[2] "%d tygodni" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1245,7 +1324,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dni" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1253,7 +1332,7 @@ msgstr[1] "%d godziny" msgstr[2] "%d godzin" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1261,46 +1340,85 @@ 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 "Wyświetlanie zawartości katalogu jest tu niedozwolone." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Dostęp zabroniony" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "Niepoprawna weryfkacja CSRF zakończona. Żądanie zostało przerwane." -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\" %(path)s \" nie istnieje" +#: 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 "" +"Widzisz tą wiadomość, ponieważ ta witryna HTTPS wymaga aby przeglądarka " +"wysłała nagłówek 'Referer header', a żaden nie został wysłany. Nagłówek ten " +"jest wymagane ze względów bezpieczeństwa, aby upewnić się, że Twoja " +"przeglądarka nie została przechwycona przez osoby trzecie." -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Zawartość %(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 "" +"Jeżeli nagłówki \"Referer\" w Twojej przeglądarce są wyłączone, to proszę " +"włącz je ponownie. Przynajmniej dla tej strony, połączeń HTTPS lub zapytań " +"typu \"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 "" +"Widzisz tą wiadomość, ponieważ ta witryna wymaga ciasteczka CSRF do " +"przesyłania formularza. Ciasteczko to jest wymagane ze względów " +"bezpieczeństwa, aby upewnić się, że Twoja przeglądarka nie została " +"przechwycona przez osoby trzecie." + +#: 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 "" +"Jeżeli ciasteczka w Twojej przeglądarce są wyłączone, to proszę włącz je " +"ponownie. Przynajmniej dla tej strony lub żadań typu \"same-origin\"." -#: views/generic/dates.py:42 +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "Więcej informacji jest dostępnych po ustawieniu DEBUG=True." + +#: views/generic/dates.py:43 msgid "No year specified" msgstr "Nie określono roku" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Nie określono miesiąca" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Nie określono dnia" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Nie określono tygodnia" -#: 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 nie jest dostępny" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1309,7 +1427,7 @@ "Wyświetlanie %(verbose_name_plural)s z datą przyszłą jest niedostępne, gdyż " "atrybut '%(class_name)s.allow_future' ma wartość 'False'." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "" @@ -1320,21 +1438,35 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Nie znaleziono %(verbose_name)s spełniających wybrane kryteria" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "Podanego numeru strony nie można przekształcić na liczbę całkowitą, nie " "przyjął on również wartości 'last' oznaczającej ostatnią stronę z dostępnego " "zakresu." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Nieprawidłowy numer strony (%(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 nie zawiera żadnych elementów, a atrybut '%(class_name)s.allow_empty' " "ma wartość 'False'." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Wyświetlanie zawartości katalogu jest tu niedozwolone." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\" %(path)s \" nie istnieje" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Zawartość %(directory)s " diff -Nru python-django-1.6.6/django/conf/locale/pt/formats.py python-django-1.7.4/django/conf/locale/pt/formats.py --- python-django-1.6.6/django/conf/locale/pt/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pt/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', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06' + '%Y-%m-%d', '%d/%m/%Y', '%d/%m/%y', # '2006-10-25', '25/10/2006', '25/10/06' # '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006' # '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006' ) Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/pt/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/pt/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/pt/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/pt/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/pt/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pt/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,17 +1,21 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Raúl Pedro Fernandes Santos, 2014 # Bruno Miguel Custódio , 2012 # Jannis Leidel , 2011 +# José Durães , 2014 +# jorgecarleitao , 2014 # Nuno Mariz , 2011-2013 # Paulo Köch , 2011 +# Raúl Pedro Fernandes Santos, 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-31 16:09+0000\n" -"Last-Translator: Nuno Mariz \n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-08-24 09:01+0000\n" +"Last-Translator: Raúl Pedro Fernandes Santos\n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/django/" "language/pt/)\n" "MIME-Version: 1.0\n" @@ -29,6 +33,10 @@ msgstr "Árabe" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "Asturiano" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbaijano" @@ -81,319 +89,347 @@ msgstr "Inglês" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "Inglês da Austrália" + +#: 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 "Espanhol" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Espanhol Argentino" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Espanhol mexicano" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Nicarágua Espanhol" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Espanhol Venezuelano" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Estónio" -#: 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 "Persa" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Filandê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ão" -#: 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 "Galaciano" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebraico" -#: 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 "Interlíngua" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Indonesian" msgstr "Indonésio" -#: 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 "Cazaque" -#: 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 "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ão" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Macedónio" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Malaiala" -#: 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 "Marathi" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "Birmanês" -#: 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 "Nepali" -#: 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 (Nynors)" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Ossetic" -#: 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 "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 Brasileiro" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Romeno" -#: 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 "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 "Sérvio" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Sérvio Latim" -#: 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 "Suaí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 "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 "Udmurte" -#: 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 "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 "Mapas do Site" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Ficheiros Estáticos" + +#: 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 "Introduza um 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 "Introduza um URL válido." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." msgstr "Introduza um número inteiro válido." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Introduza um endereço de e-mail válido." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Este valor apenas poderá conter letras, números, undercores ou hífenes." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Introduza um endereço IPv4 válido." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Insira um endereço IPv6 válido." -#: 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 "Digite um endereço válido IPv4 ou 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 "Introduza apenas números separados por vírgulas." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Garanta que este valor seja %(limit_value)s (tem %(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 "Garanta que este valor seja 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 "Garanta que este valor seja 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 +444,7 @@ "Garanta que este valor tenha pelo menos %(limit_value)d caracteres (tem " "%(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 +459,75 @@ "Garanta que este valor tenha no máximo %(limit_value)d caracteres (tem " "%(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 deverá ser único para %(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 "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 com este %(field_label)s já existe." +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s com este %(field_labels)s já 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 "O valor %(value)r não é uma opção válida." +msgstr "O valor %(value)r não é uma escolha válida." -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Este campo não pode ser nulo." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Este campo não pode ser vazio." -#: 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 com este %(field_label)s já 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 "" +"%(field_label)s tem de ser único 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 do 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 "Inteiro" -#: 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 "O valor '%(value)s' deve ser um inteiro." +msgstr "O valor '%(value)s' deve ser um número inteiro." -#: 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 "O valor '%(value)s' deve ser True ou False." -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Boolean (Pode ser True ou False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "String (até %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Inteiros separados por virgula" -#: 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 +536,7 @@ "O valor '%(value)s' tem um formato de data inválido. Deve ser no formato " "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 " @@ -500,11 +545,11 @@ "O valor '%(value)s' tem o formato correto (YYYY-MM-DD) mas é uma data " "inválida." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Data (sem 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[." @@ -513,7 +558,7 @@ "O valor '%(value)s' tem um formato inválido. Deve ser no formato 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]]" @@ -522,79 +567,79 @@ "O valor '%(value)s' tem o formato correto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" "[TZ]) mas é uma data/hora inválida." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Data (com 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 "O valor '%(value)s' deve ser um número decimal." -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Número décimal" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "Endereço de e-mail" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Caminho do ficheiro" -#: db/models/fields/__init__.py:1029 +#: db/models/fields/__init__.py:1537 #, python-format msgid "'%(value)s' value must be a float." -msgstr "O valor '%(value)s' deve ser um número em vírgula flutuante." +msgstr "O valor '%(value)s' deve ser um número de vírgula flutuante." -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Número em vírgula flutuante" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Inteiro grande (8 byte)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "Endereço IPv4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "Endereço 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 "O valor '%(value)s' deve ser None, True ou False." -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "Boolean (Pode ser True, False ou None)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Inteiro positivo" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Pequeno número inteiro positivo" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (até %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Inteiro 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]] " @@ -603,7 +648,7 @@ "O valor '%(value)s' tem um formato inválido. Deve ser no 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 " @@ -612,70 +657,70 @@ "O valor '%(value)s' tem o formato correto (HH:MM[:ss[.uuuuuu]]) mas a 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 "Dados binários simples" -#: 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 "Imagem" -#: 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 "A instância de %(model)s com pk %(pk)r não existe." -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Relação de um-para-um" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Relação de muitos-para-muitos" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Este campo é obrigatório." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Introduza um número inteiro." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Introduza um 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] "Garanta que não tem mais de %(max)s dígito no total." msgstr[1] "Garanta que não tem mais de %(max)s dígitos no 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] "Garanta que não tem mais %(max)s casa decimal." msgstr[1] "Garanta que não tem mais %(max)s casas decimais." -#: 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,32 +729,32 @@ msgstr[0] "Garanta que não tem mais de %(max)s dígito antes do ponto decimal." msgstr[1] "Garanta que não tem mais de %(max)s dígitos antes do ponto decimal." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Introduza uma 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 "Introduza uma hora válida." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Introduza uma 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 "" "Nenhum ficheiro foi submetido. Verifique o tipo de codificação do formulário." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Nenhum ficheiro submetido." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "O ficheiro submetido encontra-se vazio." -#: 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,12 +766,12 @@ "Garanta que o nome deste ficheiro tenha no máximo %(max)d caracteres (tem " "%(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, submeta um ficheiro ou remova a seleção da caixa, não 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." @@ -734,22 +779,26 @@ "Introduza uma imagem válida. O ficheiro que introduziu ou não é uma imagem " "ou está corrompido." -#: 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 "" "Selecione uma opção válida. %(value)s não se encontra nas opções disponíveis." -#: 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 "Introduza uma lista de valores." +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "Introduza um 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" @@ -757,41 +806,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 "Os dados do ManagementForm está omisso ou foi adulterado" +msgstr "Os dados do ManagementForm estão em falta ou foram adulterados" -#: 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 submeta %d ou menos formulários." msgstr[1] "Por favor submeta %d ou menos formulários." -#: 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 submeta %d ou mais formulários." +msgstr[1] "Por favor submeta %d ou mais formulários." + +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "Ordem" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Remover" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Por favor corrija os dados duplicados em %(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 os dados duplicados em %(field)s, que deverá 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 " @@ -800,34 +856,34 @@ "Por favor corrija os dados duplicados em %(field_name)s que deverá ser único " "para o %(lookup)s em %(date_field)s.\"" -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Por favor corrija os valores duplicados abaixo." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "A chave estrangeira em linha não coincide com a chave primária na instância " "pai." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Selecione uma opção válida. Esse valor não se encontra opções disponíveis." -#: 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ão é um valor válido para uma chave 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 "" "Mantenha pressionado o \"Control\", ou \"Command\" no Mac, para selecionar " "mais do que um." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -836,15 +892,15 @@ "%(datetime)s não pode ser interpretada de fuso horário %(current_timezone)s; " "pode ser ambígua ou não podem existir." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Atualmente" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Modificar" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Limpar" @@ -860,63 +916,63 @@ msgid "No" msgstr "Não" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "sim,não,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 "meia-noite" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "meio-dia" @@ -1192,117 +1248,145 @@ msgid "December" msgstr "Dezembro" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Nem Pillow ou PIL podem ser importados: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "O módulo '_imaging' para o PIL não pode ser importados: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." msgstr "Este não é um endereço IPv6 válido." -#: 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 mês" 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 dia" msgstr[1] "%d dias" -#: 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 "Índices de diretório não são permitidas aqui." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Proibido" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "A verificação de CSRF falhou. Pedido abortado." -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" não 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á a ver esta mensagem porque este site em HTTPS requer que um cabeçalho " +"'Referer header' seja enviado pelo seu browser mas nenhum foi enviado. Este " +"cabeçalho é requerido por motivos de segurança, para garantir que o seu " +"browser não está a ser \"raptado\" por terceiros." -#: 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 "" +"Se configurou o seu browser para desactivar os cabeçalhos 'Referer', por " +"favor active-os novamente, pelo menos para este site, ou para ligações " +"HTTPS, ou para pedidos '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 "" +"Está a ver esta mensagem porque este site requer um cookie CSRF quando " +"submete formulários. Este cookie é requirido por razões de segurança, para " +"garantir que o seu browser não está a ser \"raptado\" por terceiros." + +#: 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 configurou o seu browser para desactivar cookies, por favor active-os " +"novamente, pelo menos para este site, ou para pedidos 'same-origin'." + +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "Está disponível mais informação com DEBUG=True." -#: views/generic/dates.py:42 +#: views/generic/dates.py:43 msgid "No year specified" msgstr "Nenhum ano especificado" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Nenhum mês especificado" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Nenhum dia especificado" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Nenhuma semana especificado" -#: 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 "Nenhum %(verbose_name_plural)s disponível" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1311,7 +1395,7 @@ "%(verbose_name_plural)s futuros indisponíveis porque %(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 inválida '%(datestr)s' formato '%(format)s'" @@ -1321,16 +1405,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Nenhum %(verbose_name)s de acordo com a procura." -#: 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 não é 'última' ou não é possível converter para um inteiro." -#: 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 vazia e '%(class_name)s.allow_empty' é False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Índices de diretório não são permitidas aqui." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" não 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/pt_BR/formats.py python-django-1.7.4/django/conf/locale/pt_BR/formats.py --- python-django-1.6.6/django/conf/locale/pt_BR/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pt_BR/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -17,7 +17,7 @@ # 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', # '25/10/2006', '25/10/06' # '%d de %b de %Y', '%d de %b, %Y', # '25 de Out de 2006', '25 Out, 2006' # '%d de %B de %Y', '%d de %B, %Y', # '25 de Outubro de 2006', '25 de Outubro, 2006' ) Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/pt_BR/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/pt_BR/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/pt_BR/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/pt_BR/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/pt_BR/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/pt_BR/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,19 +1,22 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Allisson Azevedo , 2014 +# andrewsmedina , 2014 +# bruno.devpod , 2014 # dudanogueira , 2012 # Elyézer Rezende , 2013 -# Gladson Simplício Brito , 2013 -# Guilherme Gondim , 2011-2013 +# Gladson , 2013 +# Guilherme Gondim , 2011-2014 # Jannis Leidel , 2011 # Sandro , 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-21 13:06+0000\n" -"Last-Translator: Elyézer Rezende \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: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "django/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -31,6 +34,10 @@ msgstr "Árabe" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbaijão" @@ -83,320 +90,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 "Espanhol" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Espanhol Argentino" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Espanhol Mexicano" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Espanhol Nicaraguense" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Espanhol Venuzuelano" -#: 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 "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 "Frísia" -#: 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 "Galiciano" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebraico" -#: 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 "Interlíngua" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Indonesian" msgstr "Indonésio" -#: 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 "Cazaque" -#: 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 "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ão" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Macedônio" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Malaiala" -#: 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 "Birmanês" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Dano-norueguês" -#: 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 "Neerlandês" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Novo Norueguês" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Osseto" -#: 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 "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 Brasileiro" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Romeno" -#: 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 "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 "Albanesa" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Sérvio" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Sérvio 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 "Suaíli" -#: 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 "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 "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 "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 "Site Maps" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Arquivos Estáticos" + +#: 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 "Informe um 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 "Informe uma URL válida." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Digite um número inteiro válido." +msgstr "Insira um número inteiro válido." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Informe um endereço de email válido." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Insira um \"slug\" válido consistindo de letras, números, sublinhados (_) ou " "hífens." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Insira um endereço IPv4 válido." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Insira um endereço IPv6 válido." -#: 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 um endereço IPv4 ou IPv6 válido." -#: 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 apenas dígitos separados por vírgulas." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Certifique-se de que o valor é %(limit_value)s (ele é %(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 "Certifique-se que este valor seja 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 "Certifique-se que este valor seja 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 " @@ -411,7 +446,7 @@ "Certifique-se de que o valor tenha no mínimo %(limit_value)d caracteres (ele " "possui %(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,261 +461,268 @@ "Certifique-se de que o valor tenha no máximo %(limit_value)d caracteres (ele " "possui %(show_value)d)." -#: 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\" deve ser único para %(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 com este %(field_label)s já existe." +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s com este %(field_labels)s já 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 "O valor %(value)r não é uma opção válida." +msgstr "Valor %(value)r não é uma opção válida." -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Este campo não pode ser nulo." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Este campo não pode estar vazio." -#: 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 com este %(field_label)s já 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 "" +"%(field_label)s deve ser único 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 do 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 "Inteiro" -#: 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 "O valor '%(value)s' deve ser um inteiro." +msgstr "'%(value)s' valor deve ser um inteiro." -#: 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 "O valor '%(value)s' deve ser True ou False." +msgstr "'%(value)s' valor deve ser True ou False." -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "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 "String (até %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Inteiros separados por vírgula" -#: 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 "" -"O valor '%(value)s' tem um formato de data inválido. Ele deve estar no " -"formato YYYY-MM-DD." +"'%(value)s' valor tem um formato de data inválido. Ele deve estar no 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 "" -"O valor '%(value)s' tem o formato correto (YYYY-MM-DD), mas é uma data " +"'%(value)s' valor tem o formato correto (AAAA-MM-DD), mas é uma data " "inválida." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Data (sem 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 "" -"O valor '%(value)s' tem um formato inválido. Ele deve estar no formato YYYY-" -"MM-DD HH:MM[:ss[.uuuuuu]][TZ]." +"'%(value)s' valor tem um formato inválido. Ele deve estar no 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]]" "[TZ]) but it is an invalid date/time." msgstr "" -"O valor '%(value)s' tem o formato correto (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" +"'%(value)s' valor tem o formato correto (AAAA-MM-DD HH: MM [:. Ss [uuuuuu]] " "[TZ]), mas é uma data/hora inválida." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Data (com 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 "O valor '%(value)s' deve ser um número decimal." +msgstr "'%(value)s' valor deve ser um 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 "Endereço de e-mail" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Caminho do arquivo" -#: db/models/fields/__init__.py:1029 +#: db/models/fields/__init__.py:1537 #, python-format msgid "'%(value)s' value must be a float." -msgstr "O valor '%(value)s' deve ser um float." +msgstr "'%(value)s' valor deve ser um float." -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Número de ponto flutuante" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Inteiro grande (8 byte)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "Endereço IPv4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "Endereço 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 "O valor '%(value)s' deve ser None, verdadeiro ou falso." +msgstr "'%(value)s' valor deve ser None, verdadeiro ou falso." -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "Booleano (Verdadeiro, Falso ou Nada)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Inteiro positivo" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Inteiro curto positivo" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (até %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Inteiro curto" -#: 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 "" -"O valor '%(value)s' tem um formato inválido. Ele deve estar no formato HH:MM" -"[:ss[.uuuuuu]]." +"'%(value)s' valor tem um formato inválido. Deve ser no formato HH: MM [: ss " +"[uuuuuu].] Formato." -#: 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 "" -"O valor '%(value)s' tem o formato correto (HH:MM[:ss[.uuuuuu]]), mas é uma " +"'%(value)s' valor tem o formato correto (HH: MM [:. Ss [uuuuuu]]), mas é uma " "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 "Dados binários crus" +msgstr "Dados binários bruto" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Arquivo" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Imagem" -#: 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 "A instância de %(model)s com pk %(pk)r não existe." +msgstr "%(model)s instância com pk %(pk)r não existe." -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Chave Estrangeira (tipo determinado pelo campo relacionado)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Relacionamento um-para-um" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Relacionamento muitos-para-muitos" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Este campo é obrigatório." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Informe um número inteiro." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Informe um 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] "Certifique-se de que não tenha mais de %(max)s dígito no total." msgstr[1] "Certifique-se de que não tenha mais de %(max)s dígitos no 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] "Certifique-se de que não tenha mais de %(max)s casa decimal." msgstr[1] "Certifique-se de que não tenha mais de %(max)s casas decimais." -#: 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." @@ -692,31 +734,31 @@ "Certifique-se de que não tenha mais de %(max)s dígitos antes do ponto " "decimal." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Informe uma 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 "Informe uma hora válida." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Informe uma 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 "Nenhum arquivo enviado. Verifique o tipo de codificação do formulário." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Nenhum arquivo foi enviado." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "O arquivo enviado está vazio." -#: 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 "" @@ -728,11 +770,11 @@ "Certifique-se de que o arquivo tenha no máximo %(max)d caracteres (ele " "possui %(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, envie um arquivo ou marque o checkbox, mas não 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." @@ -740,21 +782,25 @@ "Envie uma imagem válida. O arquivo enviado não é uma imagem ou está " "corrompido." -#: 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 "Faça uma escolha válida. %(value)s não é uma das escolhas disponíveis." -#: 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 "Informe uma lista de valores." +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "Insira um 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" @@ -762,41 +808,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 "Os dados do ManagementForm não foram encontrados ou foram adulterados" -#: 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 envie %d ou menos formulário." msgstr[1] "Por favor envie %d ou menos formulários." -#: 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 envie %d ou mais formulários." +msgstr[1] "Por favor envie %d ou mais formulários." + +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "Ordem" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Remover" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Por favor, corrija o valor 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, corrija o valor duplicado para %(field)s, o qual deve 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 " @@ -805,33 +858,33 @@ "Por favor, corrija o dado duplicado para %(field_name)s, o qual deve ser " "único para %(lookup)s em %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Por favor, corrija os valores duplicados abaixo." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "A chave estrangeira no inline não coincide com a chave primária na instância " "pai." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Faça uma escolha válida. Sua escolha não é uma das disponíveis." -#: 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ão é um valor válido para uma chave 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 "" "Mantenha o \"Control\", ou \"Command\" no Mac, pressionado para selecionar " "mais de uma opção." -#: 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 +893,15 @@ " %(datetime)s não pôde ser interpretado no fuso horário " "%(current_timezone)s; pode estar ambíguo ou pode não existir." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Atualmente" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Modificar" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Limpar" @@ -864,63 +917,63 @@ msgid "No" msgstr "Não" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "sim,não,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 "meia-noite" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "meio-dia" @@ -1196,117 +1249,146 @@ msgid "December" msgstr "Dezembro" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Nem o Pillow ou o PIL pode ser importado: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "A '_imaging' módulo do PIL não pode ser importado: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." msgstr "Este não é um endereço IPv6 válido." -#: 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 mês" 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 dia" msgstr[1] "%d dias" -#: 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 "Índices de diretório não são permitidos aqui." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Proibido" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "Verificação CSRF falhou. Pedido cancelado." -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" não 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 "" +"Você está vendo esta mensagem, porque este site HTTPS exige que um " +"'cabeçalho Referer' seja enviado pelo seu navegador, mas nenhum foi enviado. " +"Este cabeçalho é necessário por razões de segurança, para garantir que o seu " +"browser não está sendo invadido por terceiros." -#: 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 "" +"Se você tiver configurado seu navegador para desativar os cabeçalhos " +"'Referer', por favor ative-os novamente, pelo menos para este site, ou para " +"conexões HTTPS ou para pedidos de 'mesma origem'." + +#: 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 "" +"Você está vendo esta mensagem, porque este site requer um cookie CSRF no " +"envio de formulários. Este cookie é necessário por razões de segurança, para " +"garantir que o seu browser não está sendo invadido por terceiros." + +#: 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 você tiver configurado seu browser para desativar os cookies, por favor " +"ative-os novamente, pelo menos para este site, ou para pedidos de 'mesma " +"origem'." + +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "Mais informações estão disponíveis com DEBUG = True." -#: views/generic/dates.py:42 +#: views/generic/dates.py:43 msgid "No year specified" msgstr "Ano não especificado" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Mês não especificado" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Dia não especificado" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Semana não especificada" -#: 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 "Nenhum(a) %(verbose_name_plural)s disponível" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1315,7 +1397,7 @@ "%(verbose_name_plural)s futuros não disponíveis pois %(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 ' string de data inválida dado o formato ' %(format)s '" @@ -1325,16 +1407,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "%(verbose_name)s não encontrado de acordo com a 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ágina não é a 'última', nem pode ser convertido para um int." +msgstr "A página não é 'last', nem pode ser convertido para um inteiro." -#: 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 vazia e '%(class_name)s.allow_empty' é False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Índices de diretório não são permitidos aqui." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" não 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/ro/formats.py python-django-1.7.4/django/conf/locale/ro/formats.py --- python-django-1.6.6/django/conf/locale/ro/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ro/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/ro/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ro/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/ro/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ro/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/ro/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ro/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,15 +3,15 @@ # Translators: # mihneasim , 2011 # Daniel Ursache-Dogariu , 2011 -# Denis Darii , 2011 +# Denis Darii , 2011,2014 # Ionel Cristian Mărieș , 2012 # 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: Romanian (http://www.transifex.com/projects/p/django/language/" "ro/)\n" @@ -31,6 +31,10 @@ msgstr "Arabă" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azeră" @@ -83,323 +87,351 @@ msgstr "Engleză" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Engleză britanică" -#: 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 "Spaniolă" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Spaniolă Argentiniană" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Spaniolă Mexicană" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Spaniolă 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 "Estonă" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Bască" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Persană" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Finlandeză" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "Franceză" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Frizian" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Irlandeză" -#: 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 "Ebraică" -#: 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 "Ungară" -#: 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 "Indoneză" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Islandeză" -#: 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 "Japoneză" -#: 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 "" -#: 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 "Limba 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 "Lituaniană" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Letonă" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Macedoneană" -#: 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 -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 "Norvegiană 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 "Olandeză" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Norvegiană 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 "Poloneză" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Portugheză" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Portugheză braziliană" -#: 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 "Rusă" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slovacă" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slovenă" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Albaneză" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Sârbă" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Sârbă latină" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Suedeză" -#: 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 "Limba tamila" -#: conf/global_settings.py:121 +#: conf/global_settings.py:122 msgid "Telugu" msgstr "Limba telugu" -#: conf/global_settings.py:122 +#: conf/global_settings.py:123 msgid "Thai" msgstr "Tailandeză" -#: 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 "" -#: 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 "Ucraineană" -#: 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 "Vietnameză" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Chineză simplificată" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Chineză tradițională" +#: 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 "Introduceți o valoare validă." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Introduceți un URL 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 "" -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Introduceți un 'slug' valabil, compus numai din litere, numere, underscore " "sau cratime." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Introduceţi o adresă IPv4 validă." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Intoduceți o adresă IPv6 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 "Introduceți o adresă IPv4 sau IPv6 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 "Introduceţi numai numere separate de virgule." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" "Asiguraţi-vă că această valoare este %(limit_value)s (este %(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 "" "Asiguraţi-vă că această valoare este mai mică sau egală cu %(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 "" "Asiguraţi-vă că această valoare este mai mare sau egală cu %(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 @@ 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 " @@ -423,233 +455,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 trebuie să fie unic pentru %(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 cu %(field_label)s deja există." +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 "Câmpul nu poate fi gol." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Acest câmp nu poate fi gol." -#: 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 cu %(field_label)s deja există." + +#. 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 "Câmp de tip: %(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 "Întreg" -#: 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 (adevărat sau fals)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Şir de caractere (cel mult %(max_length)s caractere)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Numere întregi separate de 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 "" -#: 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 "Dată (fară oră)" -#: 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 "Dată (cu oră)" -#: 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 "Număr zecimal" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "Adresă e-mail" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Calea fisierului" -#: 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 "Număr cu virgulă" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Întreg mare (8 octeți)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "Adresă IPv4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "Adresă 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 (adevărat, fals sau niciuna)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Întreg pozitiv" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Întreg pozitiv mic" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (până la %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Întreg mic" -#: 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 "Timp" -#: 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 "Date binare brute" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Fișier" -#: 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 "Foreign Key (tipul determinat de către câmpul relativ)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Relaţie unul-la-unul" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Relație multe-la-multe" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Acest câmp este obligatoriu." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Introduceţi un număr întreg." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Introduceţi un număr." -#: 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." @@ -657,7 +697,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." @@ -665,7 +705,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." @@ -675,31 +715,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 "Introduceți o dată validă." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Introduceți o oră validă." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Introduceți o dată/oră validă." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Nici un fișier nu a fost trimis. Verificați tipul fișierului." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Nici un fișier nu a fost trimis." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Fișierul încărcat este gol." -#: 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 +748,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 "Fie indicați un fişier, fie bifaţi caseta de selectare, nu ambele." -#: 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,23 +760,27 @@ "Încărcaţi o imagine validă. Fişierul încărcat nu era o imagine sau era o " "imagine coruptă." -#: 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 "" "Selectați o opțiune validă. %(value)s nu face parte din opțiunile " "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 "Introduceți o listă de valori." +#: 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,15 +788,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 "" +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 +804,33 @@ 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 "Ordine" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Șterge" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Corectaţi datele duplicate pentru %(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 "Corectaţi datele duplicate pentru %(field)s , ce trebuie să fie 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 " @@ -787,34 +839,34 @@ "Corectaţi datele duplicate pentru %(field_name)s , care trebuie să fie unice " "pentru %(lookup)s în %(date_field)s ." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Corectaţi valorile duplicate de mai jos." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "Foreign key-ul inline nu se potrivește cu cheia primară a istanței mamă." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Selectați o opțiune validă. Această opțiune nu face parte din opțiunile " "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 "" " Ţine apăsat \"Control\", sau \"Command\" pe un Mac, pentru selecție " "multiplă." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -823,15 +875,15 @@ "%(datetime)s nu poate fi interpetat in fusul orar %(current_timezone)s; este " "ambiguu sau nu există." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "În prezent" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Schimbă" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Șterge" @@ -847,11 +899,11 @@ msgid "No" msgstr "Nu" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "da,nu,poate" -#: 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" @@ -859,52 +911,52 @@ msgstr[1] "%(size)d bytes" msgstr[2] "%(size)d bytes" -#: template/defaultfilters.py:826 +#: template/defaultfilters.py:898 #, python-format msgid "%s KB" msgstr "%s KO" -#: template/defaultfilters.py:828 +#: template/defaultfilters.py:900 #, python-format msgid "%s MB" msgstr "%s MO" -#: template/defaultfilters.py:830 +#: template/defaultfilters.py:902 #, python-format msgid "%s GB" msgstr "%s GO" -#: template/defaultfilters.py:832 +#: template/defaultfilters.py:904 #, python-format msgid "%s TB" msgstr "%s TO" -#: template/defaultfilters.py:834 +#: template/defaultfilters.py:906 #, python-format msgid "%s PB" msgstr "%s PO" -#: 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 "miezul nopții" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "amiază" @@ -1180,123 +1232,139 @@ msgid "December" msgstr "Decembrie" -#: 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 "sau" #. 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 an" +msgstr[1] "%d ani" +msgstr[2] "%d ani" -#: 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 lună" +msgstr[1] "%d luni" +msgstr[2] "%d luni" -#: 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 săptămână" +msgstr[1] "%d săptămâni" +msgstr[2] "%d săptămâni" -#: 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 zi" +msgstr[1] "%d zile" +msgstr[2] "%d zile" -#: 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 oră" +msgstr[1] "%d ore" +msgstr[2] "%d ore" -#: 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 minută" +msgstr[1] "%d minute" +msgstr[2] "%d minute" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" +msgstr "0 minute" + +#: views/csrf.py:105 +msgid "Forbidden" msgstr "" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Aici nu sunt permise indexuri la directoare" +#: 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\" nu 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 "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Index pentru %(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 "" -#: 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 "Niciun an specificat" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Nicio lună specificată" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Nicio zi specificată" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Nicio săptămîna specificată" -#: 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 nu e disponibil" -#: 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 +1373,7 @@ "Viitorul %(verbose_name_plural)s nu e disponibil deoarece %(class_name)s ." "allow_future este Fals." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "Dată incorectă '%(datestr)s' considerând formatul '%(format)s'" @@ -1315,17 +1383,31 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Niciun rezultat pentru %(verbose_name)s care se potrivesc interogării" -#: 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 nu este \"ultima\" și nici nu poate fi convertită într-un întreg." -#: 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 "Listă goală și '%(class_name)s.allow_empty' este Fals." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Aici nu sunt permise indexuri la directoare" + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" nu există" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Index pentru %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/ru/formats.py python-django-1.7.4/django/conf/locale/ru/formats.py --- python-django-1.6.6/django/conf/locale/ru/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ru/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -21,15 +21,15 @@ '%d.%m.%y', # '25.10.06' ) 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' + '%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 = '\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/ru/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ru/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/ru/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ru/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/ru/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ru/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,19 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Mingun , 2014 # Denis Darii , 2011 # Dimmus , 2011 # eigrad , 2012 # Eugene MechanisM , 2013 # Jannis Leidel , 2011 # Mikhail Zholobov , 2013 -# Алексей Борискин , 2013 +# Алексей Борискин , 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-10-27 16:12+0000\n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-09-05 11:12+0000\n" "Last-Translator: Алексей Борискин \n" "Language-Team: Russian (http://www.transifex.com/projects/p/django/language/" "ru/)\n" @@ -33,6 +34,10 @@ msgstr "Арабский" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "Астурийский" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Азербайджанский" @@ -85,321 +90,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 "Венесуэльский Испанский" -#: 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 " @@ -417,7 +450,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 " @@ -435,68 +468,77 @@ "Убедитесь, что это значение содержит не более %(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 не является одним из допустимых вариантов." +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» должно быть уникальным для фрагмента " +"«%(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' должно быть целым числом." -#: 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 "Логическое (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 " @@ -505,7 +547,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 " @@ -514,11 +556,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[." @@ -527,7 +569,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]]" @@ -536,79 +578,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 "Логическое (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]] " @@ -617,7 +659,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 " @@ -626,56 +668,56 @@ "Значение '%(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 "Внешний Ключ (тип определен по связанному полю)" -#: 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." @@ -683,7 +725,7 @@ msgstr[1] "Убедитесь, что вы ввели не более %(max)s цифр." msgstr[2] "Убедитесь, что вы ввели не более %(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." @@ -691,7 +733,7 @@ msgstr[1] "Убедитесь, что вы ввели не более %(max)s цифр после запятой." msgstr[2] "Убедитесь, что вы ввели не более %(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." @@ -701,31 +743,31 @@ msgstr[1] "Убедитесь, что вы ввели не более %(max)s цифр перед запятой." msgstr[2] "Убедитесь, что вы ввели не более %(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 "" @@ -740,13 +782,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." @@ -754,21 +796,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" @@ -776,15 +822,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." @@ -792,26 +838,34 @@ msgstr[1] "Пожалуйста, заполните не более %d форм." msgstr[2] "Пожалуйста, заполните не более %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 формы." +msgstr[2] "Пожалуйста, отправьте как минимум %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 " @@ -820,32 +874,32 @@ "Пожалуйста, измените значение в поле %(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 " @@ -855,15 +909,15 @@ "%(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 "Очистить" @@ -879,11 +933,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" @@ -891,52 +945,52 @@ msgstr[1] "%(size)d байта" msgstr[2] "%(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 "полдень" @@ -1212,36 +1266,26 @@ 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 "," +msgstr ", " -#: utils/timesince.py:24 +#: utils/timesince.py:25 #, python-format msgid "%d year" msgid_plural "%d years" @@ -1249,7 +1293,7 @@ msgstr[1] "%d лет" msgstr[2] "%d лет" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1257,7 +1301,7 @@ msgstr[1] "%d месяцев" msgstr[2] "%d месяцев" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1265,7 +1309,7 @@ msgstr[1] "%d недель" msgstr[2] "%d недель" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1273,7 +1317,7 @@ msgstr[1] "%d дней" msgstr[2] "%d дней" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1281,7 +1325,7 @@ msgstr[1] "%d часов" msgstr[2] "%d часов" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1289,46 +1333,92 @@ msgstr[1] "%d минут" msgstr[2] "%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 "" +"Вы видите это сообщение, потому что данный сайт использует защищённое " +"соединение и требует, чтобы заголовок 'Referer' был передан вашим браузером, " +"но он не был им передан. Данный заголовок необходим по соображениям " +"безопасности, чтобы убедиться, что ваш браузер не был взломан, а запрос к " +"серверу не был перехвачен или подменён." -#: 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', пожалуйста, разрешите ему отсылать данный заголовок по " +"крайней мере для данного сайта, или для всех HTTPS-соединений, или для " +"запросов, домен и порт назначения совпадают с доменом и портом текущей " +"страницы." + +#: 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-cookie. Данный тип cookie необходим по " +"соображениям безопасности, чтобы убедиться, что ваш браузер не был взломан и " +"не выполняет от вашего лица действий, запрограммированных третьими лицами." + +#: 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, пожалуйста, включите эту функцию вновь, по крайней мере для " +"этого сайта, или для запросов, чьи домен и порт совпадают с доменом и портом " +"текущей страницы." + +#: 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." @@ -1337,7 +1427,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 "" @@ -1349,20 +1439,34 @@ 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/sk/formats.py python-django-1.7.4/django/conf/locale/sk/formats.py --- python-django-1.6.6/django/conf/locale/sk/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sk/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 @@ -22,11 +22,11 @@ # '%d. %B %Y', '%d. %b. %Y', # '25. October 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', # '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' ) 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/sk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sk/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sk/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,14 +4,14 @@ # Jannis Leidel , 2011 # Juraj Bubniak , 2012-2013 # Marian Andre , 2013 -# Martin Kosír , 2011 +# Martin Kosír, 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-30 15:47+0000\n" -"Last-Translator: Juraj Bubniak \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: Slovak (http://www.transifex.com/projects/p/django/language/" "sk/)\n" "MIME-Version: 1.0\n" @@ -29,6 +29,10 @@ msgstr "arabský" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "azerbajdžanský" @@ -81,320 +85,348 @@ msgstr "anglický" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "britský" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Esperanto" msgstr "esperantský" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Spanish" msgstr "španielsky" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "argentínska španielčina" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "mexická španielčina" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "nikaragujská španielčina" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "venezuelská španielčina" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "estónsky" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "baskický" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "perzský" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "fínsky" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "francúzsky" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "frízsky" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "írsky" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "galícijský" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "hebrejský" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Hindi" msgstr "hindský" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Croatian" msgstr "chorvátsky" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "maďarský" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Interlingua" msgstr "interlinguánsky" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Indonesian" msgstr "indonézsky" -#: 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 "taliansky" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "japonský" -#: 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šský" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "kmérsky" -#: conf/global_settings.py:93 +#: conf/global_settings.py:94 msgid "Kannada" msgstr "kanadský" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "kórejský" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "luxemburský" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "litovský" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "lotyšský" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "macedónsky" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "malajalámsky" -#: 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 "barmsky" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "nórsky (Bokmal)" -#: 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 "holandský" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "nórsky (Nynorsk)" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "osetsky" -#: conf/global_settings.py:107 +#: conf/global_settings.py:108 msgid "Punjabi" msgstr "pandžábsky" -#: conf/global_settings.py:108 +#: conf/global_settings.py:109 msgid "Polish" msgstr "poľský" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "portugalský" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "portugalský (Brazília)" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "rumunský" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "ruský" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "slovenský" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "slovinský" -#: 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 "srbský" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "srbský (Latin)" -#: 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 "svahilský" -#: conf/global_settings.py:120 +#: conf/global_settings.py:121 msgid "Tamil" msgstr "tamilský" -#: conf/global_settings.py:121 +#: conf/global_settings.py:122 msgid "Telugu" msgstr "telúgsky" -#: conf/global_settings.py:122 +#: conf/global_settings.py:123 msgid "Thai" msgstr "thajský" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "turecký" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "tatársky" -#: conf/global_settings.py:125 +#: conf/global_settings.py:126 msgid "Udmurt" msgstr "udmurtský" -#: conf/global_settings.py:126 +#: conf/global_settings.py:127 msgid "Ukrainian" msgstr "ukrajinský" -#: conf/global_settings.py:127 +#: conf/global_settings.py:128 msgid "Urdu" msgstr "urdský" -#: conf/global_settings.py:128 +#: conf/global_settings.py:129 msgid "Vietnamese" msgstr "vietnamský" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "čínsky (zjednodušene)" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "čínsky (tradične)" +#: 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 "Zadajte platnú hodnotu." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Zadajte platnú URL adresu." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Zadajte platné celé číslo." +msgstr "" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Zadajte platnú e-mailovú adresu." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Zadajte platný 'slug' pozostávajúci z písmen, čísel, podčiarkovníkov alebo " "pomlčiek." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Zadajte platnú 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 "Zadajte platnú 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 "Zadajte platnú IPv4 alebo 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 "Zadajte len číslice oddelené čiarkami." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Uistite sa, že táto hodnota je %(limit_value)s (je to %(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 "Uistite sa, že táto hodnota je menšia alebo rovná %(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 "Uistite sa, že hodnota je väčšia alebo rovná %(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 +444,7 @@ "Uistite sa, že zadaná hodnota má najmenej %(limit_value)d znakov (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 " @@ -430,240 +462,241 @@ "Uistite sa, že táto hodnota má najviac %(limit_value)d znakov (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 "%(field_name)s musí byť unikátne pre %(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 "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 "%(model_name)s s týmto %(field_label)s už existuje." +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 "Hodnota %(value)r nie je platná možnosť." +msgstr "" -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Toto pole nemôže byť prázdne." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Toto pole nemôže byť prázdne." -#: 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 s týmto %(field_label)s už 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 "" + +#: 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 "'%(value)s' musí byť celé číslo." +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' value musí byť True alebo False." +msgstr "" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Logická hodnota (buď True alebo False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Reťazec (až do %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Celé čísla oddelené čiarkou" -#: 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' má neplatný tvar dátumu. Musí byť v tvare YYYY-MM-DD." +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 "" -"'%(value)s' je v správnom tvare (YYYY-MM-DD), ale je to neplatný dátum." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Dátum (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[." "uuuuuu]][TZ] format." msgstr "" -"'%(value)s' má neplatný tvar. Musí byť v tvare 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' je v správnom tvare (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]), ale je " -"to neplatný dátum/čas." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Dátum (a čas)" -#: 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' musí byť desatinné číslo." +msgstr "" -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Desatinné číslo" -#: 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 "Cesta k súboru" -#: 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' musí byť desatinné číslo." +msgstr "" -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Číslo s plávajúcou desatinnou čiarkou" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Veľké celé číslo (8 bajtov)" -#: 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 "'%(value)s' musí byť buď None, True alebo False." +msgstr "" -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "Logická hodnota (buď True, False alebo 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 "Malé kladné 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 (najviac %(max_length)s)" -#: 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]] " "format." -msgstr "'%(value)s' má neplatný tvar. Musí byť v tvare HH:MM[:ss[.uuuuuu]]." +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 "" -"'%(value)s' je v správnom tvare (HH:MM[:ss[.uuuuuu]]), ale je to 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 "Binárne dáta" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Súbor" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Obrázok" -#: 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 inštancia s primárnym kľúčom %(pk)r neexistuje." +msgstr "" -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Cudzí kľúč (typ určuje pole v relácii)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Typ relácie: jedna k jednej" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Typ relácie: M ku N" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Toto pole je povinné." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Zadajte celé číslo." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Zadajte čí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." @@ -671,7 +704,7 @@ msgstr[1] "Uistite sa, že nie je zadaných celkovo viac ako %(max)s číslice." msgstr[2] "Uistite sa, že nie je zadaných celkovo viac ako %(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." @@ -679,7 +712,7 @@ msgstr[1] "Uistite sa, že nie sú zadané viac ako %(max)s desatinné miesta." msgstr[2] "Uistite sa, že nie je zadaných viac ako %(max)s desatinných miest." -#: 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,31 +728,31 @@ "Uistite sa, že nie je zadaných viac ako %(max)s číslic pred desatinnou " "čiarkou." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Zadajte platný dátum." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Zadajte platný čas." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Zadajte platný dátum a čas." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Súbor nebol odoslaný. Skontrolujte typ kódovania vo formulári." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Žiaden súbor nebol odoslaný." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Odoslaný súbor je prázdny." -#: 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 "" @@ -731,13 +764,13 @@ msgstr[2] "" "Uistite sa, že názov súboru má najviac %(max)d znakov (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 "" "Odošlite prosím súbor alebo zaškrtnite políčko pre vymazanie vstupného poľa, " "nie 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." @@ -745,21 +778,25 @@ "Nahrajte platný obrázok. Súbor, ktorý ste odoslali nebol obrázok alebo bol " "poškodený." -#: 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 platnú voľbu. %(value)s nepatrí medzi dostupné možnosti." -#: 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 zoznam hodnô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 "(Skryté pole %(name)s) %(error)s" @@ -767,15 +804,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 "Dáta ManagementForm chýbajú alebo boli sfalšované" +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." @@ -783,25 +820,33 @@ msgstr[1] "Prosím odošlite %d alebo menej formulárov." msgstr[2] "Prosím odošlite %d alebo menej formulárov." -#: 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 "Poradie" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Odstrániť" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Prosím, opravte duplicitné dáta pre %(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 "Dáta pre %(field)s musia byť unikátne, prosím, opravte duplikáty." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -810,33 +855,33 @@ "Dáta pre %(field_name)s musia byť unikátne pre %(lookup)s v %(date_field)s, " "prosím, opravte duplikáty." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Prosím, opravte nižšie uvedené duplicitné hodnoty. " -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "Vnorený cudzí kľúč sa nezhoduje s nadradenou inštanciou primárnho kľúča." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Vyberte platnú možnosť. Vybraná položka nepatrí medzi dostupné možnosti." -#: 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\" nie je platná hodnota pre primárny kľúč." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Ak chcete vybrať viac ako jednu položku, podržte \"Control\", alebo \"Command" "\" na počítači 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 " @@ -845,15 +890,15 @@ "Hodnota %(datetime)s v časovej zóne %(current_timezone)s sa nedá " "interpretovať; môže byť nejednoznačná alebo nemusí existovať." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Súčasne" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Zmeniť" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Vymazať" @@ -869,11 +914,11 @@ msgid "No" msgstr "Nie" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "áno,nie,možno" -#: 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" @@ -881,52 +926,52 @@ msgstr[1] "%(size)d bajty" msgstr[2] "%(size)d bajtov" -#: 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 "popoludní" -#: utils/dateformat.py:48 +#: utils/dateformat.py:60 msgid "a.m." msgstr "dopoludnia" -#: utils/dateformat.py:53 +#: utils/dateformat.py:65 msgid "PM" msgstr "popoludní" -#: utils/dateformat.py:54 +#: utils/dateformat.py:66 msgid "AM" msgstr "dopoludnia" -#: utils/dateformat.py:103 +#: utils/dateformat.py:149 msgid "midnight" msgstr "polnoc" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "poludnie" @@ -1202,36 +1247,26 @@ msgid "December" msgstr "december" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "PIL ani Pillow sa nedá naimportovať: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "Modul '_imaging' pre PIL sa nedá naimportovať: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." -msgstr "Toto nieje platná IPv6 adresa." +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 "alebo" #. 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" @@ -1239,7 +1274,7 @@ msgstr[1] "%d roky" msgstr[2] "%d rokov" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1247,7 +1282,7 @@ msgstr[1] "%d mesiace" msgstr[2] "%d mesiacov" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1255,7 +1290,7 @@ msgstr[1] "%d týždne" msgstr[2] "%d týždňov" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1263,7 +1298,7 @@ msgstr[1] "%d dni" msgstr[2] "%d dní" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1271,7 +1306,7 @@ msgstr[1] "%d hodiny" msgstr[2] "%d hodín" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1279,46 +1314,72 @@ msgstr[1] "%d minúty" msgstr[2] "%d minút" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "0 minút" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Výpis adresárov tu nieje povolený." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" neexistuje" +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Výpis %(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 "Nešpecifikovaný rok" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Nešpecifikovaný mesiac" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Nešpecifikovaný deň" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Nešpecifikovaný týždeň" -#: 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 nie sú dostupné" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1327,7 +1388,7 @@ "Budúce %(verbose_name_plural)s nie sú dostupné pretože %(class_name)s." "allow_future má hodnotu False. " -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "Neplatný dátumový reťazec '%(datestr)s' pre formát '%(format)s'" @@ -1338,19 +1399,33 @@ msgstr "" "Nebol nájdený žiadny %(verbose_name)s zodpovedajúci databázovému dopytu" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "Stránka nemá hodnotu 'last' a taktiež nie je možné prekonvertovať hodnotu na " "celé číslo." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Nesprávna 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 "" "Zoznam je prázdny a zároveň má '%(class_name)s.allow_empty' hodnotu False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Výpis adresárov tu nieje povolený." + +#: 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 "Výpis %(directory)s" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/sl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sl/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sl/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # zejn , 2011-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 14:27+0000\n" -"Last-Translator: zejn \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: Slovenian (http://www.transifex.com/projects/p/django/" "language/sl/)\n" "MIME-Version: 1.0\n" @@ -31,6 +31,10 @@ msgstr "Arabščina" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbajdžanščina" @@ -83,321 +87,349 @@ msgstr "Angleščina" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Britanska Angleščina" -#: 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 "Španščina" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Argentinska španščina" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Mehiška španščina" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Nikaragvijska španščina" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Španščina (Venezuela)" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Estonščina" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Baskovščina" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Perzijščina" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Finščina" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "Francoščina" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Frizijščina" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Irščina" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Galičanski jezik" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebrejski jezik" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Hindi" msgstr "Hindujščina" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Croatian" msgstr "Hrvaščina" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Madžarščina" -#: 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 jezik" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Italijanščina" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Japonščina" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "Gruzijščina" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "Kazaščina" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "Kmerščina" -#: conf/global_settings.py:93 +#: conf/global_settings.py:94 msgid "Kannada" msgstr "Kanareščina" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "Korejščina" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Luksemburščina" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Litvanščina" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Latvijščina" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Makedonščina" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Malajalščina" -#: conf/global_settings.py:100 +#: conf/global_settings.py:101 msgid "Mongolian" msgstr "Mongolščina" -#: conf/global_settings.py:101 +#: conf/global_settings.py:102 +msgid "Marathi" +msgstr "" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "Burmanski jezik" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Norveščina Bokmal" -#: conf/global_settings.py:103 +#: conf/global_settings.py:104 msgid "Nepali" msgstr "Nepalščina" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" msgstr "Nizozemščina" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Norveščina Nynorsk" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Osetski jezik" -#: conf/global_settings.py:107 +#: conf/global_settings.py:108 msgid "Punjabi" msgstr "Pandžabščina" -#: conf/global_settings.py:108 +#: conf/global_settings.py:109 msgid "Polish" msgstr "Poljščina" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Portugalščina" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Brazilska portugalščina" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Romunščina" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Ruščina" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slovaščina" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slovenščina" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Albanščina" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Srbščina" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Srbščina v latinici" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Švedščina" -#: conf/global_settings.py:119 +#: conf/global_settings.py:120 msgid "Swahili" msgstr "Svahili" -#: conf/global_settings.py:120 +#: conf/global_settings.py:121 msgid "Tamil" msgstr "Tamilščina" -#: conf/global_settings.py:121 +#: conf/global_settings.py:122 msgid "Telugu" msgstr "Teluščina" -#: conf/global_settings.py:122 +#: conf/global_settings.py:123 msgid "Thai" msgstr "Tajski jezik" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Turščina" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Tatarščina" -#: conf/global_settings.py:125 +#: conf/global_settings.py:126 msgid "Udmurt" msgstr "Udmurski jezik" -#: conf/global_settings.py:126 +#: conf/global_settings.py:127 msgid "Ukrainian" msgstr "Ukrajinščina" -#: conf/global_settings.py:127 +#: conf/global_settings.py:128 msgid "Urdu" msgstr "Jezik Urdu" -#: conf/global_settings.py:128 +#: conf/global_settings.py:129 msgid "Vietnamese" msgstr "Vietnamščina" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Poenostavljena kitajščina" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Tradicionalna kitajščina" +#: 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 "Vnesite veljavno vrednost." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Vnesite veljaven URL naslov." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Vnesite veljavno število." +msgstr "" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Vnesite veljaven e-poštni naslov." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Vnesite veljavno URL okrajšavo. Vrednost sme vsebovati le črke, števila, " "podčrtaje ali pomišljaje." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Vnesite veljaven IPv4 naslov." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Vnesite veljaven IPv6 naslov." -#: 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 "Vnesite veljaven IPv4 ali IPv6 naslov." -#: 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 "Vnesite samo števila, ločena z vejicami." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" "Poskrbite, da bo ta vrednost %(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 "Poskrbite, da bo ta vrednost manj kot ali natanko %(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 "Poskrbite, da bo ta vrednost večja ali enaka %(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 " @@ -418,7 +450,7 @@ "Preverite, da ima ta vrednost vsaj %(limit_value)d znakov (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 " @@ -439,245 +471,241 @@ "Preverite, da ima ta vrednost največ %(limit_value)d znakov (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 edinstveno 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 "in" -#: 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 s tem %(field_label)s že obstaja." +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 "Vrednost %(value)r ni veljavna izbira." +msgstr "" -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "To polje ne more biti prazno." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "To polje ne more 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 s tem %(field_label)s že obstaja." + +#. 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 "Celo število (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 "Vrednost '%(value)s' mora biti celo število." +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 "Vrednost '%(value)s' mora biti bodisi Da ali Ne." +msgstr "" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Boolova vrednost (True ali False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Niz znakov (vse do %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Z vejico ločena cela števila (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 "" -"Vrednost '%(value)s' ni v prepoznani obliki datuma. Biti mora v obliki LLLL-" -"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 "" -"Vrednost '%(value)s' je v prepoznani obliki zapisa datuma (LLLL-MM-DD), a ta " -"datum ne obstaja. " -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Datum (brez ure)" -#: 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 "" -"Vrednost '%(value)s' je v neprepoznani obliki. Biti mora v obliki LLLL-MM-DD " -"UU:MM[:ss[.uuuuuu]][ČP]." -#: 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 "" -"Vrednost '%(value)s' je v pravi obliki (LLLL-MM-DD UU:MM[:ss[.uuuuuu]][ČP]), " -"a ta datum oziroma točka v času ne obstaja." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Datum (z uro)" -#: db/models/fields/__init__.py:921 +#: db/models/fields/__init__.py:1297 #, python-format msgid "'%(value)s' value must be a decimal number." -msgstr "Vrednost '%(value)s' mora biti decimalno število." +msgstr "" -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Decimalno število" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-poštni naslov" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Pot 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 "Vrednost '%(value)s' mora biti decimalno število v plavajoči vejici." +msgstr "" -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Število s plavajočo vejico" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Velika (8 bajtna) cela števila " -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "IPv4 naslov" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "IP naslov" -#: 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 "Vrednost '%(value)s' mora biti bodisi brez vrednosti, Da ali Ne." +msgstr "" -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" msgstr "Boolova vrednost (True, False ali None)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Pozitivno celo število" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Pozitivno celo število (do 64 tisoč)" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Okrajšava naslova (do največ %(max_length)s znakov)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Celo število" -#: db/models/fields/__init__.py:1276 +#: db/models/fields/__init__.py:1870 msgid "Text" msgstr "Besedilo" -#: 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 "" -"Vrednost '%(value)s' je v napačnem zapisu. Biti mora v obliki UU: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 "" -"Vrednost '%(value)s' je v prepoznanem zapisu (UU:MM[:ss[.uuuuuu]]), a ta čas " -"ne obstaja." -#: 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 (spletni naslov)" -#: db/models/fields/__init__.py:1384 +#: db/models/fields/__init__.py:2000 msgid "Raw binary data" msgstr "Surovi binarni podatki" -#: 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 "Instanca %(model)s s primarnim ključem %(pk)r ne obstaja." +msgstr "" -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Tuji ključ (tip odvisen od povezanega polja)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Relacija ena-na-ena" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Relacija več-na-več" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "To polje je obvezno." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Vnesite celo število." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Vnesite število." -#: 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." @@ -686,7 +714,7 @@ msgstr[2] "Poskrbite, da skupno ne bojo več kot %(max)s števke." msgstr[3] "Poskrbite, da skupno ne bo več kot %(max)s števk." -#: 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." @@ -695,7 +723,7 @@ msgstr[2] "Poskrbite, da skupno ne bo več kot %(max)s decimalnih mest." msgstr[3] "Poskrbite, da skupno ne bo več kot %(max)s decimalnih mest." -#: 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." @@ -710,31 +738,31 @@ msgstr[3] "" "Poskrbite, da skupno ne bo več kot %(max)s števk pred decimalno vejico." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Vnesite veljaven datum." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Vnesite veljaven čas." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Vnesite veljaven datum/čas." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Datoteka ni bila poslana. Preverite nabor znakov v formi." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Poslali niste nobene datoteke." -#: 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 "" @@ -752,11 +780,11 @@ "Poskrbite, da bo imelo to ime datoteke največ %(max)d znakov (trenutno ima " "%(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Prosim oddaj datoteko ali izberi počisti okvir, ampak ne oboje hkrati." -#: 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." @@ -764,21 +792,25 @@ "Naložite veljavno sliko. Naložena datoteka ni bila slika ali pa je bila le-" "ta okvarjena." -#: 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 "Izberite veljavno možnost. %(value)s ni med ponujenimi izbirami." -#: 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 "Vnesite seznam vrednosti." +#: 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 "(Skrito polje %(name)s) %(error)s" @@ -786,15 +818,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 "Manjkajo ManagementForm podatki ali pa so bili spremenjeni" +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." @@ -803,26 +835,35 @@ msgstr[2] "Pošljite največ %d obrazce." msgstr[3] "Pošljite največ %d obrazcev." -#: 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 "Razvrsti" -#: 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 "Prosimo, odpravite podvojene vrednosti 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 "" "Prosimo popravite podvojene vrednosti za %(field)s, ki morajo biti unikatne." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -831,29 +872,29 @@ "Prosimo popravite podvojene vrednosti za polje %(field_name)s, ki mora biti " "edinstveno za %(lookup)s po %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Prosimo odpravite podvojene vrednosti spodaj." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "Tuji ključ se ne ujema z glavnim ključem povezanega vnosa." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Izberite veljavno možnost. Te možnosti ni med ponujenimi izbirami." -#: 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\" ni veljavna vrednost za glavni ključ." -#: 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\" (ali \"Command\" na Mac-u) za izbiro več kot enega." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -862,15 +903,15 @@ "Vrednosti %(datetime)s ni bilo možno razumeti v časovnem pasu " "%(current_timezone)s; ali je izraz dvoumen ali pa ne obstaja." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Trenutno" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Spremeni" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Počisti" @@ -886,11 +927,11 @@ msgid "No" msgstr "Ne" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "da,ne,morda" -#: 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" @@ -899,52 +940,52 @@ msgstr[2] "%(size)d bajti" msgstr[3] "%(size)d bajtov" -#: 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 "polnoč" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "poldne" @@ -1220,36 +1261,26 @@ msgid "December" msgstr "December" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Ni bilo možno najti knjižnice Pillow ali PIL: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "Modula '_imaging' iz knjižnice PIL ni bilo možno uporabiti: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." -msgstr "To ni veljaven IPv6 naslov." +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 "ali" #. 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" @@ -1258,7 +1289,7 @@ msgstr[2] "%d leta" msgstr[3] "%d let" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1267,7 +1298,7 @@ msgstr[2] "%d meseci" msgstr[3] "%d mesecev" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1276,7 +1307,7 @@ msgstr[2] "%d tedni" msgstr[3] "%d tednov" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1285,7 +1316,7 @@ msgstr[2] "%d dnevi" msgstr[3] "%d dni" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1294,7 +1325,7 @@ msgstr[2] "%d ure" msgstr[3] "%d ur" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1303,46 +1334,72 @@ msgstr[2] "%d minute" msgstr[3] "%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 "Prikaz vsebine mape ni dovoljen." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" ne obstaja." +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Vsebina mape %(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 "Leto ni vnešeno" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Mesec ni vnešen" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Dan ni vnešen" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Teden ni vneš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 "Na voljo ni noben %(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." @@ -1351,7 +1408,7 @@ "Prihodnje %(verbose_name_plural)s niso na voljo, ker je vrednost " "%(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 "" @@ -1363,16 +1420,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Noben %(verbose_name)s ne ustreza poizvedbi" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Strani niti ni 'last' niti ni celo število." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Neveljavna stran (%(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 "Prazen seznam ob nastavitvi '%(class_name)s.allow_empty = False'." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Prikaz vsebine mape ni dovoljen." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" ne obstaja." + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Vsebina mape %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/sq/formats.py python-django-1.7.4/django/conf/locale/sq/formats.py --- python-django-1.6.6/django/conf/locale/sq/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sq/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 = 'g.i.s.A' -# DATETIME_FORMAT = +# DATETIME_FORMAT = YEAR_MONTH_FORMAT = 'F Y' MONTH_DAY_FORMAT = 'j F' SHORT_DATE_FORMAT = 'Y-m-d' -# 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/sq/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sq/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sq/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sq/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sq/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sq/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:52+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/" "sq/)\n" @@ -27,6 +27,10 @@ msgstr "Arabe" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbaixhanase" @@ -79,322 +83,350 @@ msgstr "Angleze" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Anglishte Britanike" -#: 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 "Spanjolle" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Spanjishte Argjentinase" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Spanjishte Meksikane" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Spanjishte Nikaraguane" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Spanjishte Venezueliane" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Estoneze" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Baske" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Persiane" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Finlandeze" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "Frënge" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Frisiane" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Irlandeze" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Galike" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebraishte" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Hindi" msgstr "Indiane" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Croatian" msgstr "Kroate" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Hungareze" -#: 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 "Indoneziane" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Islandeze" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Italiane" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Japoneze" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "Gjeorgjiane" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "Kazake" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "Khmere" -#: 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 "Koreane" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Luksemburgase" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Lituaneze" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Latviane" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Maqedone" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Malajalame" -#: conf/global_settings.py:100 +#: conf/global_settings.py:101 msgid "Mongolian" msgstr "Mongoliane" -#: conf/global_settings.py:101 +#: conf/global_settings.py:102 +msgid "Marathi" +msgstr "" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "Burmeze" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Norvegjeze Bokmal" -#: conf/global_settings.py:103 +#: conf/global_settings.py:104 msgid "Nepali" msgstr "Nepaleze" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" msgstr "Holandeze" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Norvegjeze Nynorsk" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Osetishte" -#: conf/global_settings.py:107 +#: conf/global_settings.py:108 msgid "Punjabi" msgstr "Panxhabe" -#: conf/global_settings.py:108 +#: conf/global_settings.py:109 msgid "Polish" msgstr "Polake" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Portugeze" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Portugeze Braziliane" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Rumune" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Ruse" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slovake" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slovene" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Shqipe" -#: 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 Latine" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Suedeze" -#: 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 "Tamileze" -#: 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 "Tailandeze" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Turke" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Tatare" -#: 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 "Ukrainase" -#: 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 "Vietnameze" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Kineze e Thjeshtuar" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Kineze Tradicionale" +#: 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 "Jepni vlerë të vlefshme." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Jepni një URL të vlefshme." -#: 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 "Jepni një adresë email të vlefshme." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Jepni një 'slug' të vlefshëm, të përbërë nga shkronja, numra, nëvija ose " "vija në mes." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Jepni një vendndodhje të vlefshme IPv4." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Jepni një adresë IPv6 të vlefshme" -#: 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 "Jepninjë adresë IPv4 ose IPv6 të vlefshme." -#: 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 "Jepni vetëm shifra të ndara nga presje." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" "Sigurohuni që kjo vlerë të jetë %(limit_value)s (është %(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 "" "Sigurohuni që kjo vlerë të jetë më e vogël ose baraz me %(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 "Sigurohuni që kjo vlerë është më e madhe ose baraz me %(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 @@ "Sigurohuni që kjo vlerë ka të paktën %(limit_value)d shenja (ka " "%(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,247 +456,255 @@ "Sigurohuni që kjo vlerë ka të shumtën %(limit_value)d shenja (ka " "%(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 duhet të jetë unike për %(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 " dhe " -#: 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 "Ka tashmë një %(model_name)s me këtë %(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 "Kjo fushë nuk mund të jetë bosh." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Kjo fushë nuk mund të jetë e zbrazët." -#: 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 "Ka tashmë një %(model_name)s me këtë %(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 "Fushë e llojit: %(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 "Numër i plotë" -#: 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 "Buleane (Ose True, ose False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Varg (deri në %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Numra të plotë të ndarë me presje" -#: 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 "Datë (pa kohë)" -#: 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 "Datë (me kohë)" -#: 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 "Numër dhjetor" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "Adresë email" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Shteg kartele" -#: 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 "Numër i plotë i madh (8 bajte)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "Adresë IPv4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "Adresë 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 "Buleane (Ose True, ose False, ose None)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Numër i plotë pozitiv" -#: 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 "Identifikues (deri në %(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 "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 "Kohë" -#: 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ë dhëna dyore të papërpunuara" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Kartelë" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Figurë" -#: 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 "Kyç i Jashtëm (lloj i përcaktuar nga fusha përkatëse)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Marrëdhënie një-për-një" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Marrëdhënie shumë-për-shumë" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Kjo fushë është e domosdoshme." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Jepni një numër të tërë." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Jepni një numër." -#: 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." @@ -673,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 "Jepni një datë të vlefshme." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Jepni një kohë të vlefshme." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Jepni një datë/kohë të vlefshme." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "" "Nuk u parashtrua ndonjë kartelë. Kontrolloni llojin e kodimit te forma." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Nuk u parashtrua kartelë." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Kartela e parashtruar është bosh." -#: 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,13 +750,13 @@ "Sigurohuni që ky emër kartele ka të shumtën %(max)d shenja (it has " "%(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" "Ju lutem, ose parashtroni një kartelë, ose i vini shenjë kutizës për " "pastrim, jo që të dyja." -#: 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." @@ -724,23 +764,27 @@ "Ngarkoni një figurë të vlefshme. Kartela që ngarkuat ose nuk qe figurë, ose " "qe figurë e dëmtuar." -#: 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 "" "Përzgjidhni një zgjedhje të vlefshme. %(value)s nuk është nga zgjedhjet e " "mundshme." -#: 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 "Jepni një listë vlerash." +#: 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 "(Fushë e fshehur %(name)s) %(error)s" @@ -748,42 +792,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 "Rend" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Fshije" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Ju lutem, ndreqni të dhënat dyfishe për %(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 "" "Ju lutem, ndreqni të dhënat dyfishe për %(field)s, të cilat duhet të jenë " "unike." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -792,34 +843,34 @@ "Ju lutem, ndreqni të dhënat dyfishe për %(field_name)s të cilat duhet të " "jenë unike për %(lookup)s te %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Ju lutem, ndreqni vlerat dyfishe më poshtë." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "Kyçi i jashtëm \"inline\" nuk u përputh me kyçin parësor të instancës mëmë." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Përzgjidhni një zgjedhje të vlefshme. Ajo zgjedhje nuk është një nga " "zgjedhjet e mundshme." -#: 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 "" "Mbani të shtypur \"Control\", ose \"Command\" në Mac, për të përzgjedhur më " "shumë se një." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -828,15 +879,15 @@ "%(datetime)s nuk u interpretua dot brenda zonë kohore %(current_timezone)s; " "mund të jetë e dykuptimtë ose mund të mos ekzistojë." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Tani" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Ndryshoje" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Pastroje" @@ -852,63 +903,63 @@ msgid "No" msgstr "Jo" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "po,jo,ndoshta" -#: 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 bajt" msgstr[1] "%(size)d bajte" -#: 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 "mesnatë" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "meditë" @@ -1184,117 +1235,133 @@ msgid "December" msgstr "Dhjetor" -#: 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 "ose" #. 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 vit" msgstr[1] "%d vjetë" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d muaj" msgstr[1] "%d muaj" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d javë" msgstr[1] "%d javë" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ditë" msgstr[1] "%d ditë" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d orë" msgstr[1] "%d orë" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minutë" msgstr[1] "%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 "Këtu nuk lejohen treguesa drejtorish." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" nuk ekziston" +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Tregues i %(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 "Nuk është caktuar vit" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Nuk është caktuar muaj" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Nuk është caktuar ditë" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Nuk është caktuar javë" -#: 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 "Nuk ka %(verbose_name_plural)s të përcaktuar" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1303,7 +1370,7 @@ "%(verbose_name_plural)s i ardhshëm jo i passhëm, ngaqë %(class_name)s." "allow_future është False." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "" @@ -1314,16 +1381,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Nuk u gjetën %(verbose_name)s me përputhje" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Faqja nuk është 'last', as mund të shndërrohet në një int." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Faqe e pavlefshme (%(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ë e zbrazët dhe '%(class_name)s.allow_empty' është False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Këtu nuk lejohen treguesa drejtorish." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" nuk ekziston" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Tregues i %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/sr/formats.py python-django-1.7.4/django/conf/locale/sr/formats.py --- python-django-1.6.6/django/conf/locale/sr/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sr/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -24,22 +24,22 @@ # '%d. %b %Y.', '%d. %B %Y.', # '25. Oct 2006.', '25. October 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', # '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.' + '%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 = ',' THOUSAND_SEPARATOR = '.' Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/sr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sr/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sr/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,10 @@ # Janos Guljas , 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: Serbian (http://www.transifex.com/projects/p/django/language/" "sr/)\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 "" "Унесите исрпаван „слаг“, који се састоји од слова, бројки, доњих црта или " "циртица." -#: 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[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 " @@ -417,233 +449,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 мора да буде јединствен за %(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 "Булова вредност (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 adresa" -#: 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." @@ -651,7 +691,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." @@ -659,7 +699,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." @@ -669,31 +709,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 "Унесите исправан датум." -#: 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,11 +742,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." @@ -714,22 +754,26 @@ "Пребаците исправан фајл. Фајл који је пребачен или није слика, или је " "оштећен." -#: 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 "" @@ -737,15 +781,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." @@ -753,26 +797,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 "Редослед" -#: 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 " @@ -781,31 +833,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 "" -#: 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 " @@ -814,15 +866,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 "Очисти" @@ -838,11 +890,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" @@ -850,52 +902,52 @@ msgstr[1] "%(size)d бајта" msgstr[2] "%(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 "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 "подне" @@ -1171,36 +1223,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" @@ -1208,7 +1250,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1216,7 +1258,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1224,7 +1266,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1232,7 +1274,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1240,7 +1282,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1248,46 +1290,72 @@ 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." -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." @@ -1296,7 +1364,7 @@ "Опција „future“ није доступна за „%(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“" @@ -1306,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 "Страница није последња, нити може бити конвертована у тип 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“ има вредност 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/sr_Latn/formats.py python-django-1.7.4/django/conf/locale/sr_Latn/formats.py --- python-django-1.6.6/django/conf/locale/sr_Latn/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sr_Latn/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -24,22 +24,22 @@ # '%d. %b %Y.', '%d. %B %Y.', # '25. Oct 2006.', '25. October 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', # '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.' + '%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 = ',' THOUSAND_SEPARATOR = '.' Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sr_Latn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sr_Latn/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sr_Latn/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sr_Latn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sr_Latn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,10 @@ # Janos Guljas , 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: Serbian (Latin) (http://www.transifex.com/projects/p/django/" "language/sr@latin/)\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,320 +84,348 @@ 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 "nikaragvanski š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 "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 "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 "hindu" -#: 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 "kambodijski" -#: 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 knjž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 (latinica)" -#: 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 "vijetnamski" -#: 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 vrednost." -#: 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 isrpavan „slag“, koji se sastoji od slova, brojki, donjih crta ili " "cirtica." -#: 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 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 "Ovo polje mora da bude %(limit_value)s (trenutno ima %(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 vrednost mora da bude manja od %(limit_value)s. ili tačno toliko." -#: 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 vrednost mora biti veća od %(limit_value)s ili tačno toliko." -#: 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[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 " @@ -417,233 +449,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 vrednošć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 da ostane 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 da ostane 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 vrednošć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 "Ponje 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 "Ceo 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 vrednost (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 "Celi 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 "Imejl 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 "Veliki ceo broj" -#: 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 "Bulova vrednost (True, False ili None)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Pozitivan ceo broj" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Pozitivan mali ceo broj" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slag (ne duži od %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Mali ceo 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 "Vreme" -#: 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 "Fajl" -#: 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 "Strani ključ (tip određuje referentno polje)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Relacija jedan na jedan" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Relacija više na više" -#: 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 ceo 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." @@ -651,7 +691,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." @@ -659,7 +699,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." @@ -669,31 +709,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 vreme" -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Unesite ispravan datum/vreme." -#: 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. Proverite 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 "" @@ -702,11 +742,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 "Može se samo poslati fajl ili izbrisati, ne oba." -#: 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." @@ -714,22 +754,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 vrednostima. 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 vrednosti." +#: 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 "" @@ -737,15 +781,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." @@ -753,26 +797,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 "Redosled" -#: 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 dupliran 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 dupliran 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 " @@ -781,31 +833,31 @@ "Ispravite dupliran 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 duplirane vrednosti 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 vrednost 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 obelež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 " @@ -814,15 +866,15 @@ "Vreme %(datetime)s ne može se predstaviti u vremenskoj zoni " "%(current_timezone)s." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Trenutno" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Izmeni" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Očisti" @@ -838,11 +890,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" @@ -850,52 +902,52 @@ msgstr[1] "%(size)d bajta" msgstr[2] "%(size)d bajtova" -#: 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 "pre 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" @@ -1171,36 +1223,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 "%(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" @@ -1208,7 +1250,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1216,7 +1258,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1224,7 +1266,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1232,7 +1274,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1240,7 +1282,7 @@ msgstr[1] "" msgstr[2] "" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1248,46 +1290,72 @@ 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." -msgstr "Indeksi direktorijuma nisu dozvoljeni ovde." +#: 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 "Indeks direktorijuma %(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 "Godina nije naznačena" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Mesec 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 "Nedelja 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 "Nedostupni objekti %(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." @@ -1296,7 +1364,7 @@ "Opcija „future“ nije dostupna za „%(verbose_name_plural)s“ jer " "%(class_name)s.allow_future ima vrednost 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“ dat formatu „%(format)s“" @@ -1306,16 +1374,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Nijedan objekat klase %(verbose_name)s nije nađen datim upitom." -#: 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 poslednja, niti može biti konvertovana u tip 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 "Prazna lista i „%(class_name)s.allow_empty“ ima vrednost False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Indeksi direktorijuma nisu dozvoljeni ovde." + +#: 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 "Indeks direktorijuma %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/sv/formats.py python-django-1.7.4/django/conf/locale/sv/formats.py --- python-django-1.6.6/django/conf/locale/sv/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sv/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -37,5 +37,5 @@ '%m/%d/%y', # '10/25/06' ) 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/sv/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sv/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sv/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sv/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sv/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sv/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Alex Nordlund , 2012 +# Alexander Nordlund , 2012 +# Andreas Pelme , 2014 # Jannis Leidel , 2011 # Mattias Jansson , 2011 +# Rasmus Précenth , 2014 # Samuel Linde , 2011 -# biljettshop , 2013 +# Thomas Lundqvist , 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 10:00+0000\n" -"Last-Translator: biljettshop \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: Swedish (http://www.transifex.com/projects/p/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -30,6 +32,10 @@ msgstr "Arabiska" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerbajdzjanska" @@ -82,323 +88,351 @@ msgstr "Engelska" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "Australisk engelska" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Brittisk engelska" -#: 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 "Spanska" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Argentinsk spanska" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Mexikansk Spanska" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Nicaraguansk spanska" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Spanska (Venezuela)" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Estländska" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Baskiska" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Persiska" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Finska" -#: 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 "Frisiska" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Irländska" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Galisiska" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Hebreiska" -#: 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 "Kroatiska" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Ungerska" -#: 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 "Indonesiska" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Isländska" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Italienska" -#: 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 "Georgiska" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "Kazakiska" -#: 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 "Koreanska" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Luxemburgiska" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Lettiska" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Lettiska" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Makedonska" -#: 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 "Mongoliska" -#: conf/global_settings.py:101 +#: conf/global_settings.py:102 +msgid "Marathi" +msgstr "" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "Burmesiska" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Norska (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ändska" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Norska (nynorsk)" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Ossetiska" -#: 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 "Polska" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Portugisiska" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Brasiliensk portugisiska" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Rumänska" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Ryska" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slovakiska" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slovenska" -#: 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 "Serbiska" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Serbiska (latin)" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Svenska" -#: 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 "Tamilska" -#: 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 "Thailändska" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Turkiska" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Tatariska" -#: conf/global_settings.py:125 +#: conf/global_settings.py:126 msgid "Udmurt" msgstr "Udmurtiska" -#: conf/global_settings.py:126 +#: conf/global_settings.py:127 msgid "Ukrainian" msgstr "Ukrainska" -#: 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 "Vietnamesiska" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Förenklad Kinesiska" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Traditionell Kinesiska" +#: 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 "Fyll i ett giltigt värde." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Fyll i en giltig URL." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "Fyll i ett giltigt heltal." +msgstr "" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Fyll i en giltig e-postadress." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" "Fyll i en giltig 'slug', beståendes av enbart bokstäver, siffror, " "understreck samt bindestreck." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Fyll i en giltig IPv4 adress." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Ange en giltig IPv6-adress." -#: 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 "Ange en giltig IPv4 eller IPv6-adress." -#: 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 "Fyll enbart i siffror separerade med kommatecken." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" "Kontrollera att detta värde är %(limit_value)s (det är %(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 "" "Kontrollera att detta värde är mindre än eller lika med %(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 "" "Kontrollera att detta värde är större än eller lika med %(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 +447,7 @@ "Säkerställ att detta värde åtminstone har %(limit_value)d tecken (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 " @@ -428,259 +462,255 @@ "Säkerställ att detta värde har som mest %(limit_value)d tecken (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 måste vara unikt för %(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 "och" -#: 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 detta %(field_label)s finns redan." +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 "Värdet %(value)r är inget giltigt alternativ." +msgstr "" -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Detta fält får inte vara null." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Detta fält får inte vara 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 detta %(field_label)s finns redan." + +#. 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 "Fält av typ: %(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 "Värdet '%(value)s' måste vara ett heltal." +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 "Värdet '%(value)s' måste vara antingen True eller False." +msgstr "" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Boolesk (antingen 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 "Sträng (upp till %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Komma-separerade 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 "" -"Värdet '%(value)s' har ett ogiltigt datumformat. Det måste vara i formatet " -"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 "" -"Värdet '%(value)s' har det giltiga formatet (YYYY-MM-DD) men det är ett " -"ogiltigt datum." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Datum (utan 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 "" -"Värdet '%(value)s' har ett ogiltigt datumformat. Det måste vara i formatet " -"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 "" -"Värdet '%(value)s' har det giltiga formatet (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) men det är ett ogiltigt datum/tid." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" msgstr "Datum (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 "Värdet '%(value)s' måste vara ett decimaltal." +msgstr "" -#: 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-postadress" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Sökväg till fil" -#: db/models/fields/__init__.py:1029 +#: db/models/fields/__init__.py:1537 #, python-format msgid "'%(value)s' value must be a float." -msgstr "Värdet '%(value)s' måste vara ett flyttal." +msgstr "" -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" msgstr "Flyttal" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Stort (8 byte) heltal" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "IPv4-adress" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "IP-adress" -#: 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 "Värdet '%(value)s' måste vara antingen \"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 "Boolesk (antingen 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 litet heltal" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug (upp till %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Litet heltal" -#: 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 "" -"Värdet '%(value)s' har ett ogiltigt format. Det måste vara i formatet 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 "" -"Värdet '%(value)s' har det korrekta formatet (HH:MM[:ss[.uuuuuu]]) men är en " -"ogiltig tid." -#: 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ärdata" -#: 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 "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 "Modell %(model)s med primärnyckel %(pk)r finns inte." +msgstr "" -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" msgstr "Främmande nyckel (typ bestäms av relaterat fält)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Ett-till-ett-samband" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Många-till-många-samband" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Detta fält måste fyllas i." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Fyll i ett heltal." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Fyll i ett 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] "Säkerställ att det inte är mer än %(max)s siffra totalt." msgstr[1] "Säkerställ att det inte är mer än %(max)s siffror totalt." -#: 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] "Säkerställ att det inte är mer än %(max)s decimal." msgstr[1] "Säkerställ att det inte är mer än %(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." @@ -691,31 +721,31 @@ msgstr[1] "" "Säkerställ att det inte är mer än %(max)s siffror före decimalavskiljaren." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Fyll i ett giltigt datum." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Fyll i en giltig tid." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Fyll i ett giltigt datum/tid." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Ingen fil skickades. Kontrollera kodningstypen i formuläret." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Ingen fil skickades." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Den skickade filen är 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 "" @@ -725,13 +755,13 @@ msgstr[1] "" "Säkerställ att filnamnet har som mest %(max)d tecken (den 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 "" "Var vänlig antingen skicka en fil eller markera kryssrutan för att rensa, " "inte både och. " -#: 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." @@ -739,23 +769,27 @@ "Ladda upp en giltig bild. Filen du laddade upp var antingen ingen bild eller " "en korrupt bild." -#: 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älj ett giltigt alternativ. %(value)s finns inte bland tillgängliga " "alternativ." -#: 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 "Fyll i en lista med värden." +#: 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 "(Gömt fält %(name)s) %(error)s" @@ -763,40 +797,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 saknas eller har manipulerats" +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] "Vänligen lämna %d eller färre formulär." msgstr[1] "Vänligen lämna %d eller färre formulär." -#: 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 "Sortering" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Radera" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Var vänlig korrigera duplikatdata för %(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 "Var vänlig korrigera duplikatdata för %(field)s, som måste vara 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 " @@ -805,34 +846,34 @@ "Var vänlig korrigera duplikatdata för %(field_name)s som måste vara unik för " "%(lookup)s i %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Vänligen korrigera duplikatvärdena nedan." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" "Den infogade främmande nyckeln matchade inte den överordnade instansens " "primära nyckel." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Välj ett giltigt alternativ. Det valet finns inte bland tillgängliga " "alternativ." -#: forms/models.py:1147 +#: forms/models.py:1194 #, python-format msgid "\"%(pk)s\" is not a valid value for a primary key." msgstr "\"%(pk)s\" är inte ett giltigt värde för en primärnyckel." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" "Håll ner \"Control\" eller \"Command\" på en Mac för att välja fler än en." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -841,15 +882,15 @@ "%(datetime)s kunde inte tolkas i tidszonen %(current_timezone)s; det kan " "vara en ogiltig eller tvetydigt tidpunkt" -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Nuvarande" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Ändra" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Rensa" @@ -865,63 +906,63 @@ msgid "No" msgstr "Nej" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "ja,nej,kanske" -#: 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" -#: 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 "e.m." -#: utils/dateformat.py:48 +#: utils/dateformat.py:60 msgid "a.m." msgstr "f.m." -#: utils/dateformat.py:53 +#: utils/dateformat.py:65 msgid "PM" msgstr "FM" -#: utils/dateformat.py:54 +#: utils/dateformat.py:66 msgid "AM" msgstr "EM" -#: utils/dateformat.py:103 +#: utils/dateformat.py:149 msgid "midnight" msgstr "midnatt" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "middag" @@ -1197,117 +1238,133 @@ msgid "December" msgstr "december" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Varken Pillow eller PIL kunde importeras: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "'_imaging' modulen för PIL kunde inte importeras: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." -msgstr "Detta är inte en giltig IPv6 adress." +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 "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ånad" msgstr[1] "%d månader" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d vecka" msgstr[1] "%d veckor" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d dag" msgstr[1] "%d dagar" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d timme" msgstr[1] "%d timmar" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minut" msgstr[1] "%d minuter" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "0 minuter" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Kataloglistningar är inte tillåtna här." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" finns inte" +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Innehåll i %(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 "Inget år angivet" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Ingen månad angiven" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Ingen dag angiven" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Ingen vecka angiven" -#: 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 "Inga %(verbose_name_plural)s är tillgängliga" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1316,7 +1373,7 @@ "Framtida %(verbose_name_plural)s är inte tillgängliga eftersom " "%(class_name)s.allow_future är False." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "Ogiltig datumsträng '%(datestr)s' med givet format '%(format)s'" @@ -1326,16 +1383,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Hittade inga %(verbose_name)s som matchar frågan" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Sidan är inte 'last', och kan inte heller omvandlas till en int." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Ogiltig sida (%(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 lista och '%(class_name)s.allow_empty' är False." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Kataloglistningar är inte tillåtna här." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" finns inte" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Innehåll i %(directory)s" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/sw/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/sw/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/sw/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/sw/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/sw/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/sw/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,12 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: +# machaku , 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: Swahili (http://www.transifex.com/projects/p/django/language/" "sw/)\n" @@ -18,13 +19,17 @@ #: conf/global_settings.py:51 msgid "Afrikaans" -msgstr "" +msgstr "Kiafrikaani" #: conf/global_settings.py:52 msgid "Arabic" msgstr "Kiarabu" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Kiazerbaijani" @@ -34,7 +39,7 @@ #: conf/global_settings.py:55 msgid "Belarusian" -msgstr "" +msgstr "Kibelarusi" #: conf/global_settings.py:56 msgid "Bengali" @@ -42,7 +47,7 @@ #: conf/global_settings.py:57 msgid "Breton" -msgstr "" +msgstr "Kibretoni" #: conf/global_settings.py:58 msgid "Bosnian" @@ -77,318 +82,346 @@ msgstr "Kiingereza" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "Kiingereza cha Kiaustalia" + +#: conf/global_settings.py:67 msgid "British English" msgstr "Kiingereza cha Uingereza" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Esperanto" msgstr "Kiesperanto" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Spanish" msgstr "Kihispania" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Kihispania cha Argentina" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Kihispania cha Mexico" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Kihispania cha Nikaragua" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" -msgstr "" +msgstr "Kihispania cha Kivenezuela" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Kiestonia" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Kibaskyue" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Kipershia" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Kifini" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "Kifaransa" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Kifrisi" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Kiairishi" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Kigalatia" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Kiyahudi" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Hindi" msgstr "Kihindi" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Croatian" msgstr "Kikroeshia" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Kihangaria" -#: 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 "Kiindonesia" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Kiaiselandi" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Kiitaliano" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Kijapani" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "Kijiojia" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "Kizakhi" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "Kihema" -#: conf/global_settings.py:93 +#: conf/global_settings.py:94 msgid "Kannada" msgstr "Kikanada" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "Kikorea" -#: 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 "Kilithuania" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Kilatvia" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Kimacedonia" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Kimalayalam" -#: conf/global_settings.py:100 +#: conf/global_settings.py:101 msgid "Mongolian" msgstr "Kimongolia" -#: 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 "kibekmali cha Kinorwei" -#: conf/global_settings.py:103 +#: conf/global_settings.py:104 msgid "Nepali" msgstr "Kinepali" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" msgstr "Kidachi" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Kinynorki cha Kinorwei" -#: 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 "Kipanjabi" -#: conf/global_settings.py:108 +#: conf/global_settings.py:109 msgid "Polish" msgstr "Kipolishi" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Kireno" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Kireno cha Kibrazili" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Kiromania" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Kirusi" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Kislovakia" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Kislovenia" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Kialbania" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Kiserbia" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" msgstr "Kilatini cha Kiserbia" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "Kiswidi" -#: conf/global_settings.py:119 +#: conf/global_settings.py:120 msgid "Swahili" msgstr "Kiswahili" -#: conf/global_settings.py:120 +#: conf/global_settings.py:121 msgid "Tamil" msgstr "Kitamili" -#: conf/global_settings.py:121 +#: conf/global_settings.py:122 msgid "Telugu" msgstr "kitegulu" -#: conf/global_settings.py:122 +#: conf/global_settings.py:123 msgid "Thai" msgstr "Kithai" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Kituruki" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Kitatari" -#: 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 "Kiukreni" -#: conf/global_settings.py:127 +#: conf/global_settings.py:128 msgid "Urdu" msgstr "Kiurdu" -#: conf/global_settings.py:128 +#: conf/global_settings.py:129 msgid "Vietnamese" msgstr "Kivietinamu" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Kichina Kilichorahisishwa" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Kichina Asilia" +#: 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 "Muonekano wa tovuti" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "Ingiza thamani halali" -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Ingiza URL halali." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "" +msgstr "Ingiza namba halali" -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." -msgstr "" +msgstr "Ingiza anuani halali ya barua pepe" -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "Ingiza slagi halali yenye herufi, namba, \"_\" au \"-\"" -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Ingiza anuani halali ya IPV4" -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Ingiza anuani halali ya 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 "Ingiza anuani halali za IPV4 au 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 "Ingiza tarakimu zilizotenganishwa kwa koma tu." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Hakikisha thamani hii ni %(limit_value)s (ni %(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 "Hakikisha thamani hii ni ndogo kuliko au sawa 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 "Hakikisha thamani hii ni kubwa kuliko au sawa na %(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 " @@ -399,7 +432,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 " @@ -410,247 +443,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 "Ni lazima %(field_name)s kuwa pekee kwa %(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 "na" -#: 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 "Tayari kuna %(field_label)s kwa %(model_name)s nyingine." +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 "Uga huu hauwezi kuwa hauna kitu." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Uga huu hauwezi kuwa mtupu" -#: 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 "Tayari kuna %(field_label)s kwa %(model_name)s nyingine." + +#. 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 "Uga wa aina %(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 "Inteja" -#: 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 "" +msgstr "Thamani ya '%(value)s' ni lazma iwe Kweli au Si kweli" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Buleani (Aidha Kweli au Si kweli)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Tungo (hadi %(max_length)s)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Inteja zilizotengwa kwa 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 "Tarehe (bila ya muda)" -#: 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 "Tarehe (pamoja na muda)" -#: 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 "Namba ya desimali" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "Anuani ya baruapepe" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Njia ya faili" -#: 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 "Namba ya `floating point`" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" msgstr "Inteja kubwa (baiti 8)" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "anuani ya IPV4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "anuani ya 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 "Buleani (Aidha kweli, Si kweli au Hukuna)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Inteja chanya" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Inteja chanya ndogo" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slagi (hadi %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Inteja ndogo" -#: db/models/fields/__init__.py:1276 +#: db/models/fields/__init__.py:1870 msgid "Text" msgstr "Maandishi" -#: 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 "Muda" -#: 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 "Faili" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Picha" -#: 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' (aina inapatikana kwa uga unaohusiana)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Uhusiano wa moja-kwa-moja" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Uhusiano wa vingi-kwa-vingi" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Sehemu hii inahitajika" -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Ingiza namba kamili" -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Ingiza namba" -#: 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." @@ -659,31 +700,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 "Ingiza tarehe halali" -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Ingiza muda halali" -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Ingiza tarehe/muda halali" -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Hakuna faili lililokusanywa. Angalia aina ya msimbo kwenye fomu." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Hakuna faili lililokusanywa." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Faili lililokusanywa ni tupu." -#: 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 "" @@ -691,11 +732,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 "Tafadhali aidha kusanya faili au tiki kisanduku kilicho wazi, si yote." -#: 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 +744,25 @@ "Pakia picha halali. Faili ulilopakia lilikua aidha si picha au ni picha " "iliyopotoshwa." -#: 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 "Chagua chaguo halali. %(value)s si moja kati ya machaguo yaliyopo." -#: 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 "Ingiza orodha ya thamani" +#: 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 "" @@ -725,42 +770,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] "" 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 "Panga" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Futa" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Tafadhali rekebisha data zilizojirudia kwa %(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 "" "Tafadhali rekebisha data zilizojirudia kwa %(field)s, zinazotakiwa kuwa za " "kipekee." -#: 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,31 +821,31 @@ "Tafadhali sahihisha data zilizojirudia kwa %(field_name)s ,uga huu ni lazima " "kuwa wa pekee kwa %(lookup)s katika %(date_field)s." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Tafadhali sahihisha thamani zilizojirudia hapo chini." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "`Inline foreign key` haijafanana tukio la `primary key` mama." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "Chagua chaguo halali. Chaguo hilo si moja kati ya chaguzi halali" -#: 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 "" "Shikilia chini \"Control\", au \"Command\" kwenye Mac, ili kuchagua zaidi ya " "moja. " -#: 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 +854,15 @@ "Imeshindikana kufasiri %(datetime)s katika majira ya %(current_timezone)s;" "Inawezekana kuwa kuna utata au kiti hichi hakipo." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Kwa sasa" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Badili" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Safisha" @@ -826,63 +878,63 @@ msgid "No" msgstr "Hapana" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "ndiyo,hapana,labda" -#: 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] "baiti %(size)d" msgstr[1] "baiti %(size)d" -#: template/defaultfilters.py:826 +#: template/defaultfilters.py:898 #, python-format msgid "%s KB" msgstr "KB %s" -#: template/defaultfilters.py:828 +#: template/defaultfilters.py:900 #, python-format msgid "%s MB" msgstr "MB %s" -#: template/defaultfilters.py:830 +#: template/defaultfilters.py:902 #, python-format msgid "%s GB" msgstr "GB %s" -#: template/defaultfilters.py:832 +#: template/defaultfilters.py:904 #, python-format msgid "%s TB" msgstr "TB %s" -#: template/defaultfilters.py:834 +#: template/defaultfilters.py:906 #, python-format msgid "%s PB" msgstr "PB %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 "usiku wa manane" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "mchana" @@ -1158,117 +1210,133 @@ msgid "December" msgstr "Disemba" -#: 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 "au" #. 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] "mwaka %d" +msgstr[1] "miaka %d" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "mwezi %d" +msgstr[1] "miezi %d" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "wiki %d" +msgstr[1] "wiki %d" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "siku %d" +msgstr[1] "siku %d" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "saa %d" +msgstr[1] "saa %d" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" -msgstr[0] "" -msgstr[1] "" +msgstr[0] "dakika %d" +msgstr[1] "dakika %d" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" +msgstr "dakika 0" + +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Marufuku" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." msgstr "" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Sahirisi za saraka haziruhusiwi hapa." +#: 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\" haipo" +#: 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 "Sahirisi ya %(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 "Maelezo zaidi yanapatikana ikiwa DEBUG=True" + +#: views/generic/dates.py:43 msgid "No year specified" msgstr "Hakuna mwaka maalum uliotajwa" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Hakuna mwezi maalum uliotajwa" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Hakuna siku maalum iliyitajwa" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Hakuna wiki maalum iliyotajwa" -#: 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 "Hakujapatikana %(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 +1345,7 @@ "%(verbose_name_plural)s kutoka wakati ujao haiwezekani kwani `" "%(class_name)s.allow_future` ni `False`." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "Tungo batili ya tarehe '%(datestr)s' muundo ni '%(format)s'" @@ -1287,16 +1355,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "hakuna %(verbose_name)s kulingana na ulizo" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "Ukurasa huu si 'mwisho', na wala hauwezi kubadilishwa kuwa int." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" -msgstr "" +msgstr "Ukurasa batili (%(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 "Orodha tupu na '%(class_name)s.allow_empty'.ni 'False'." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Sahirisi za saraka haziruhusiwi hapa." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" haipo" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Sahirisi ya %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/ta/formats.py python-django-1.7.4/django/conf/locale/ta/formats.py --- python-django-1.6.6/django/conf/locale/ta/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ta/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 = '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/ta/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ta/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/ta/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ta/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/ta/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ta/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: Tamil (http://www.transifex.com/projects/p/django/language/" "ta/)\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 " @@ -400,7 +432,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 " @@ -411,247 +443,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 "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] "" 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." @@ -660,31 +700,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 "அந்த பக்கத்தின் encoding வகையைப் பரிசோதிக்க.கோப்பு சமர்பிக்கப் பட்டவில்லை " -#: 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 "" @@ -692,11 +732,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 "" -#: 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." @@ -704,21 +744,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 "" -#: 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 "" @@ -726,86 +770,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 "" "Mac இல், ஒன்றுக்கு மேற்பட்டவற்றை தேர்வு செய்ய \"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 " "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 "" @@ -821,63 +872,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 "" @@ -1153,124 +1204,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 "" @@ -1280,16 +1347,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/te/formats.py python-django-1.7.4/django/conf/locale/te/formats.py --- python-django-1.6.6/django/conf/locale/te/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/te/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 = '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/te/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/te/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/te/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/te/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/te/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/te/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,14 +4,14 @@ # bhaskar teja yerneni , 2011 # Jannis Leidel , 2011 # ప్రవీణ్ ఇళ్ళ , 2013 -# వీవెన్ వీరపనేని , 2011 +# వీవెన్ , 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-09-19 08:27+0000\n" -"Last-Translator: ప్రవీణ్ ఇళ్ళ \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: Telugu (http://www.transifex.com/projects/p/django/language/" "te/)\n" "MIME-Version: 1.0\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 "" -#: 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 " @@ -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." +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 "పదబంధం (గరిష్ఠం %(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 "" -#: 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 "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,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 "" -#: 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,84 +773,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 "దయచేసి %(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 " "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\" మాక్ లో నొక్కి ఉంచండి , ఒకటి కన్న ఎక్కువ ఎన్నుకోవటానికి" -#: 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] "%(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 "" -#: 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 "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,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/th/formats.py python-django-1.7.4/django/conf/locale/th/formats.py --- python-django-1.6.6/django/conf/locale/th/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/th/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -12,13 +12,13 @@ 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/th/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/th/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/th/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/th/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/th/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/th/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,15 +2,17 @@ # # Translators: # Jannis Leidel , 2011 +# Kowit Charoenratchatabhan , 2014 +# Sippakorn Khaimook , 2014 # Suteepat Damrongyingsupab , 2011-2012 # Suteepat Damrongyingsupab , 2013 # Vichai Vongvorakul , 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: Thai (http://www.transifex.com/projects/p/django/language/" "th/)\n" @@ -29,6 +31,10 @@ msgstr "อารบิก" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "อาเซอร์ไบจาน" @@ -81,318 +87,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 "ใส่ 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 "กรุณาใส่หมายเลขไอพีที่ถูกต้อง" -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "กรอก 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 "กรอก IPv4 หรือ 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 "ใส่ตัวเลขที่คั่นด้วยจุลภาคเท่านั้น" -#: 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 " @@ -402,7 +436,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 " @@ -412,246 +446,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." -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 "ตรรกะแบบบูลหมายถึง ค่า\"จริง\" (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 byte)" -#: 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 "หมายเลขไอพี" -#: 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 "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 "ความสัมพันธ์แบบ 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." @@ -659,62 +701,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 "ไม่มีไฟล์ใดถูกส่ง. ตรวจสอบ 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 "" "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 "โปรดเลือกไฟล์หรือติ๊ก clear checkbox อย่างใดอย่างหนึ่ง" -#: 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 "" +msgstr ":" -#: forms/forms.py:159 +#: forms/forms.py:192 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "" @@ -722,39 +768,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 "" +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 " @@ -763,29 +815,29 @@ "โปรดแก้ไขข้อมูลซ้ำซ้อนใน %(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 ไม่สัมพันธ์กับ parent 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 "เลือกตัวเลือกที่ถูกต้อง. ตัวเลือกนั้นไม่สามารถเลือกได้." -#: 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 " @@ -794,15 +846,15 @@ "%(datetime)s ไม่สามารถแปลงให้อยู่ใน %(current_timezone)s time zone ได้ เนื่องจาก " "time zone ไม่ชัดเจน หรือไม่มีอยู่จริง" -#: 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 "ล้าง" @@ -818,62 +870,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 "เที่ยงคืน" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "เที่ยงวัน" @@ -1047,7 +1099,7 @@ #: utils/dates.py:34 msgctxt "abbrev. month" msgid "April" -msgstr "เม.ษ." +msgstr "เม.ย." #: utils/dates.py:35 msgctxt "abbrev. month" @@ -1149,111 +1201,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." -msgstr "ไม่ได้รับอนุญาตให้ใช้ Directory indexes ที่นี่" +#: 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." @@ -1262,7 +1330,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'" @@ -1272,16 +1340,30 @@ msgid "No %(verbose_name)s found matching the query" msgstr "ไม่พบ %(verbose_name)s จาก 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 "ไม่ใช่หน้าสุดท้าย และไม่สามารถค่าแปลงเป็น 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 "list ว่างเปล่า และ '%(class_name)s.allow_empty' มีค่าเป็น False" + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "ไม่ได้รับอนุญาตให้ใช้ Directory indexes ที่นี่" + +#: 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/tr/formats.py python-django-1.7.4/django/conf/locale/tr/formats.py --- python-django-1.6.6/django/conf/locale/tr/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/tr/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -12,7 +12,7 @@ MONTH_DAY_FORMAT = 'd F' SHORT_DATE_FORMAT = 'd M Y' SHORT_DATETIME_FORMAT = 'd M Y H:i:s' -FIRST_DAY_OF_WEEK = 1 # Pazartesi +FIRST_DAY_OF_WEEK = 1 # Pazartesi # The *_INPUT_FORMATS strings use the Python strftime format syntax, # see http://docs.python.org/library/datetime.html#strftime-strptime-behavior @@ -22,10 +22,10 @@ # '%d %B %Y', '%d %b. %Y', # '25 Ekim 2006', '25 Eki. 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', # '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' ) DECIMAL_SEPARATOR = ',' THOUSAND_SEPARATOR = '.' Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/tr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/tr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/tr/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/tr/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/tr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/tr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,21 +2,22 @@ # # Translators: # Ahmet Emre Aladağ , 2013 -# Caner BAŞARAN , 2013 -# cihad , 2012 -# cihad , 2013 +# Burak Yavuz, 2014 +# Caner Başaran , 2013 +# Cihad GÜNDOĞDU , 2012 +# Cihad GÜNDOĞDU , 2013-2014 # Gökmen Görgen , 2013 # Jannis Leidel , 2011 -# mesutcang , 2013 +# Mesut Can Gürle , 2013 # Murat Çorlu , 2012 # Murat Sahin , 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-10-23 15:55+0000\n" -"Last-Translator: Ahmet Emre Aladağ \n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-09-15 18:39+0000\n" +"Last-Translator: Burak Yavuz\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/" "tr/)\n" "MIME-Version: 1.0\n" @@ -27,13 +28,17 @@ #: conf/global_settings.py:51 msgid "Afrikaans" -msgstr "Güney Afrika Hollanda Lehçesi" +msgstr "Afrikanca" #: conf/global_settings.py:52 msgid "Arabic" msgstr "Arapça" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "Asturyaca" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Azerice" @@ -47,7 +52,7 @@ #: conf/global_settings.py:56 msgid "Bengali" -msgstr "Bengali Dili" +msgstr "Bengalce" #: conf/global_settings.py:57 msgid "Breton" @@ -86,322 +91,349 @@ msgstr "İngilizce" #: conf/global_settings.py:66 -msgid "British English" -msgstr "İngiltere İngilizce" +msgid "Australian English" +msgstr "Avusturya İngilizcesi" #: conf/global_settings.py:67 -msgid "Esperanto" -msgstr "Esperanto" +msgid "British English" +msgstr "İngiliz İngilizce" #: conf/global_settings.py:68 +msgid "Esperanto" +msgstr "Esperanto dili" + +#: conf/global_settings.py:69 msgid "Spanish" msgstr "İspanyolca" -#: conf/global_settings.py:69 +#: conf/global_settings.py:70 msgid "Argentinian Spanish" msgstr "Arjantin İspanyolcası" -#: conf/global_settings.py:70 +#: conf/global_settings.py:71 msgid "Mexican Spanish" msgstr "Meksika İspanyolcası" -#: conf/global_settings.py:71 +#: conf/global_settings.py:72 msgid "Nicaraguan Spanish" msgstr "Nikaragua İspanyolcası" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Venezüella İspanyolcası" -#: 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 "Baskça" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Farsça" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Fince" -#: 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 "Frisce" +msgstr "Frizce" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "İrlandaca" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" -msgstr "Galler Dili" +msgstr "Galiçyaca" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "İbranice" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Hindi" -msgstr "Hinduca" +msgstr "Hintçe" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Croatian" msgstr "Hırvatça" -#: 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 "Interlingua" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Indonesian" msgstr "Endonezce" -#: conf/global_settings.py:87 -msgid "Icelandic" -msgstr "İzlanda dili" +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "Ido dili" #: conf/global_settings.py:88 +msgid "Icelandic" +msgstr "İzlandaca" + +#: conf/global_settings.py:89 msgid "Italian" msgstr "İtalyanca" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Japonca" -#: conf/global_settings.py:90 +#: conf/global_settings.py:91 msgid "Georgian" msgstr "Gürcüce" -#: conf/global_settings.py:91 +#: conf/global_settings.py:92 msgid "Kazakh" msgstr "Kazakça" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" -msgstr "Kamboçyaca" +msgstr "Kmerce" -#: conf/global_settings.py:93 +#: conf/global_settings.py:94 msgid "Kannada" -msgstr "Kannada Dili" +msgstr "Kannada dili" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "Korece" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Lüksemburgca" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Litovca" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" -msgstr "Leton Dili" +msgstr "Letonca" -#: 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 "Moğolca" -#: conf/global_settings.py:101 -msgid "Burmese" -msgstr "Birmanya dili" +#: conf/global_settings.py:102 +msgid "Marathi" +msgstr "Marathi dili" #: conf/global_settings.py:102 -msgid "Norwegian Bokmal" -msgstr "Norveçce (Bokmal)" +msgid "Burmese" +msgstr "Birmanca" #: conf/global_settings.py:103 +msgid "Norwegian Bokmal" +msgstr "Norveççe Bokmal" + +#: conf/global_settings.py:104 msgid "Nepali" msgstr "Nepalce" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" -msgstr "Flamanca" +msgstr "Flemenkçe" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" -msgstr "Norveçce (Nynorsk)" +msgstr "Norveççe Nynorsk" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Osetçe" -#: conf/global_settings.py:107 +#: conf/global_settings.py:108 msgid "Punjabi" -msgstr "Punjabice" +msgstr "Pencapça" -#: conf/global_settings.py:108 +#: conf/global_settings.py:109 msgid "Polish" msgstr "Lehçe" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Portekizce" -#: conf/global_settings.py:110 +#: conf/global_settings.py:111 msgid "Brazilian Portuguese" msgstr "Brezilya Portekizcesi" -#: conf/global_settings.py:111 +#: conf/global_settings.py:112 msgid "Romanian" msgstr "Romence" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Rusça" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Slovakça" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Slovence" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Arnavutça" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Sırpça" -#: conf/global_settings.py:117 +#: conf/global_settings.py:118 msgid "Serbian Latin" -msgstr "Sırp Latini" +msgstr "Sırpça Latin" -#: conf/global_settings.py:118 +#: conf/global_settings.py:119 msgid "Swedish" msgstr "İsveççe" -#: conf/global_settings.py:119 +#: conf/global_settings.py:120 msgid "Swahili" -msgstr "Svahili Dili" +msgstr "Savahilice" -#: conf/global_settings.py:120 +#: conf/global_settings.py:121 msgid "Tamil" msgstr "Tamilce" -#: conf/global_settings.py:121 +#: conf/global_settings.py:122 msgid "Telugu" -msgstr "Telugu Dili" +msgstr "Telugu 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ürkçe" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Tatarca" -#: conf/global_settings.py:125 +#: conf/global_settings.py:126 msgid "Udmurt" msgstr "Udmurtça" -#: 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 "Vietnamca" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" -msgstr "Basiteştirilmiş Çince" +msgstr "Basitleştirilmiş Çince" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Geleneksel Çince" +#: contrib/sitemaps/apps.py:8 +msgid "Site Maps" +msgstr "Site Haritaları" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Sabit Dosyalar" + +#: contrib/syndication/apps.py:8 +msgid "Syndication" +msgstr "Dağıtım" + +#: contrib/webdesign/apps.py:8 +msgid "Web Design" +msgstr "Web Tasarımı" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "Geçerli bir değer girin." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Geçerli bir URL girin." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." msgstr "Geçerli bir tamsayı girin." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Geçerli bir e-posta adresi girin." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." -msgstr "Lütfen sadece harf, rakam, altçizgi veya çizgiden oluşan değer girin." +msgstr "" +"Harflerden, sayılardan, altçizgilerden veya tirelerden oluşan geçerli bir " +"'kısaltma' girin." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Geçerli bir IPv4 adresi girin." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Geçerli bir IPv6 adresi girin." -#: 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 "Geçerli bir IPv4 veya IPv6 adresi girin" +msgstr "Geçerli bir IPv4 veya IPv6 adresi girin." -#: 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 "Sadece virgülle ayrılmış sayılar girin." +msgstr "Sadece virgülle ayrılmış rakamlar girin." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." -msgstr "" -"Bu değerin en az %(limit_value)s karakterden oluştuğundan emin olun (şu anki " -"karakter sayısı: %(show_value)s)." +msgstr "Bu değerin %(limit_value)s olduğuna emin olun (şu an %(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 "" -"Bu değerin %(limit_value)s karakterden az veya eşit olduğundan emin olun." +msgstr "Bu değerin %(limit_value)s değerinden az veya eşit olduğuna emin olun." -#: 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 değerin %(limit_value)s karakterden çok veya eşit olduğundan emin olun." +"Bu değerin %(limit_value)s değerinden büyük veya eşit olduğuna emin olun." -#: core/validators.py:210 +#: core/validators.py:271 #, python-format msgid "" "Ensure this value has at least %(limit_value)d character (it has " @@ -410,13 +442,13 @@ "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" -"Bu değerin en az %(limit_value)d karakterden oluştuğundan emin olun (şu anki " -"karakter sayısı: %(show_value)d)." +"Bu değerin en az %(limit_value)d karaktere sahip olduğuna emin olun (şu an " +"%(show_value)d)." msgstr[1] "" -"Bu değerin en az %(limit_value)d karakterden oluştuğundan emin olun (şu anki " -"karakter sayısı: %(show_value)d)." +"Bu değerin en az %(limit_value)d karaktere sahip olduğuna emin olun (şu an " +"%(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 " @@ -425,339 +457,354 @@ "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr[0] "" -"Bu değerin en fazla %(limit_value)d karakterden oluştuğundan emin olun (şu " -"anki karakter sayısı: %(show_value)d)." +"Bu değerin en fazla %(limit_value)d karaktere sahip olduğuna emin olun (şu " +"an %(show_value)d)." msgstr[1] "" -"Bu değerin en fazla %(limit_value)d karakterden oluştuğundan emin olun (şu " -"anki karakter sayısı: %(show_value)d)." +"Bu değerin en fazla %(limit_value)d karaktere sahip olduğuna emin olun (şu " +"an %(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 değeri %(date_field)s alanı %(lookup)s işlemi için tek " -"olmalıdır." - -#: db/models/base.py:907 forms/models.py:686 +#: db/models/base.py:975 forms/models.py:718 msgid "and" msgstr "ve" -#: 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 alanına sahip %(model_name)s zaten mevcuttur." +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "Bu %(field_labels)s alanına sahip %(model_name)s zaten mevcut." -#: 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 değeri geçerli bir seçim değildir." +msgstr "%(value)r değeri geçerli bir seçim değil." -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." -msgstr "Bu alan boş bırakılamaz." +msgstr "Bu alan boş olamaz." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." -msgstr "Bu alan boş bırakılamaz. " +msgstr "Bu alan boş olamaz." + +#: db/models/fields/__init__.py:107 +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "Bu %(field_label)s alanına sahip %(model_name)s zaten mevcut." + +#. 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 için benzersiz olmak " +"zorundadır." -#: db/models/fields/__init__.py:89 +#: db/models/fields/__init__.py:116 #, python-format msgid "Field of type: %(field_type)s" msgstr "Alan türü: %(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 "Tamsayı" -#: 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' değeri bir tamsayı olmalıdır." +msgstr "'%(value)s' değeri bir tamsayı olmak zorundadır." -#: 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' değeri Doğru-True veya Yanlış-False olmalıdır." +msgstr "'%(value)s' değeri ya True ya da False olmak zorundadır." -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" -msgstr "Mantıksal (True ya da False)" +msgstr "Boolean (Ya True ya da False)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" -msgstr "Karakter disizi (en fazla %(max_length)s)" +msgstr "Dizge (%(max_length)s karaktere kadar)" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Virgülle ayrılmış tamsayılar" -#: 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' değeri geçersiz tarih formatı. Bu YYYY-AA-GG biçiminde olmalıdır." +"'%(value)s' değeri geçersiz bir tarih biçimine sahip. Bu YYYY-MM-DD " +"biçiminde olmak zorundadır." -#: 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' değeri doğru bir biçime sahip (YYYY-MM-DD) ancak bu geçersiz bir " +"'%(value)s' değeri doğru bir biçime (YYYY-MM-DD) sahip ancak bu geçersiz bir " "tarih." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" -msgstr "Tarih (saat yok)" +msgstr "Tarih (saat olmadan)" -#: 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' değeri geçersiz bir biçime sahip. YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ] biçiminde olması gerekiyor." +"[TZ] biçiminde olmak zorundadır." -#: 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' biçimsel olarak doğru (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) ancak " -"bu geçersiz bir tarih/zaman." +"'%(value)s' değeri doğru bir biçime (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) " +"sahip ancak bu geçersiz bir tarih/saat." -#: db/models/fields/__init__.py:823 +#: db/models/fields/__init__.py:1195 msgid "Date (with time)" -msgstr "Tarih (saat var)" +msgstr "Tarih (saat olan)" -#: 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' değeri bir ondalık sayı olmalıdır." +msgstr "'%(value)s' değeri bir ondalık sayı olmak zorundadır." -#: db/models/fields/__init__.py:923 +#: db/models/fields/__init__.py:1299 msgid "Decimal number" msgstr "Ondalık sayı" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "E-posta adresi" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Dosya yolu" -#: 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' değeri float olmalı" +msgstr "'%(value)s' değeri kesirli olmak zorundadır." -#: db/models/fields/__init__.py:1031 +#: db/models/fields/__init__.py:1539 msgid "Floating point number" -msgstr "Floating point rakamı" +msgstr "Kayan noktalı sayı" -#: db/models/fields/__init__.py:1098 +#: db/models/fields/__init__.py:1623 msgid "Big (8 byte) integer" -msgstr "Büyük (8 bayt) integer" +msgstr "Büyük (8 bayt) tamsayı" -#: db/models/fields/__init__.py:1112 +#: db/models/fields/__init__.py:1638 msgid "IPv4 address" msgstr "IPv4 adresi" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "IP adresi" -#: 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' değeri None, True veya False olmak zorundadır." +msgstr "'%(value)s' değeri ya None, True ya da False olmak zorundadır." -#: db/models/fields/__init__.py:1177 +#: db/models/fields/__init__.py:1749 msgid "Boolean (Either True, False or None)" -msgstr "Mantıksal (True, False, ya da None)" +msgstr "Booleanl (Ya True, False, ya da None)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" -msgstr "Positif sayı" +msgstr "Pozitif tamsayı" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" -msgstr "Pozitif küçük sayı" +msgstr "Pozitif küçük tamsayı" -#: 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 karaktere kadar)" +msgstr "Kısaltma (%(max_length)s karaktere kadar)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" -msgstr "Küçük sayı" +msgstr "Küçük tamsayı" -#: db/models/fields/__init__.py:1276 +#: db/models/fields/__init__.py:1870 msgid "Text" msgstr "Metin" -#: 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' değerinin geçersiz bir biçimi var. Bunun HH:MM[:ss[.uuuuuu]] " -"biçiminde olması gerekiyor." +"'%(value)s' değeri geçersiz bir biçime sahip. HH:MM[:ss[.uuuuuu]] biçiminde " +"olmak zorundadır." -#: 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' değeri doğru biçime sahip (HH:MM[:ss[.uuuuuu]]) ancak bu " -"geçersiz bir zaman." +"'%(value)s' değeri doğru biçime (HH:MM[:ss[.uuuuuu]]) sahip ancak bu " +"geçersiz bir saat." -#: db/models/fields/__init__.py:1299 +#: db/models/fields/__init__.py:1898 msgid "Time" msgstr "Saat" -#: 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 "Ham ikili veri" -#: db/models/fields/files.py:217 +#: db/models/fields/files.py:225 msgid "File" msgstr "Dosya" -#: db/models/fields/files.py:324 +#: db/models/fields/files.py:375 msgid "Image" msgstr "Resim" -#: 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 "Birincil anahtarı %(pk)r olan %(model)s nesnesi mevcut değil." +msgstr "%(pk)r birincil anahtarı olan %(model)s örneği mevcut değil." -#: db/models/fields/related.py:1130 +#: db/models/fields/related.py:1582 msgid "Foreign Key (type determined by related field)" -msgstr "Yabancı Anahtar (türü ilişkili alana göre belirlenir)" +msgstr "Dış Anahtar (türü ilgili alana göre belirlenir)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Bire-bir ilişki" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" -msgstr "Çoğa-çok ilişki" +msgstr "Çoka-çok ilişki" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Bu alan zorunludur." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." -msgstr "Tam sayı girin." +msgstr "Tam bir sayı girin." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Bir sayı girin." -#: 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] "Toplamda en fazla %(max)s rakam olduğundan emin olun." -msgstr[1] "Toplamda en fazla %(max)s rakam olduğundan emin olun." +msgstr[0] "Toplamda %(max)s rakamdan daha fazla olmadığından emin olun." +msgstr[1] "Toplamda %(max)s rakamdan daha fazla olmadığından emin olun." -#: 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] "En fazla %(max)s onluk yerin olduğundan emin olun." -msgstr[1] "En fazla %(max)s onluk yerin olduğundan emin olun." +msgstr[0] "%(max)s ondalık basamaktan daha fazla olmadığından emin olun." +msgstr[1] "%(max)s ondalık basamaktan daha fazla olmadığından emin olun." -#: 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] "Onluk kısımdan önce en fazla %(max)s rakam olduğundan emin olun." -msgstr[1] "Onluk kısımdan önce en fazla %(max)s rakam olduğundan emin olun." +msgstr[0] "" +"Ondalık noktasından önce %(max)s rakamdan daha fazla olmadığından emin olun." +msgstr[1] "" +"Ondalık noktasından önce %(max)s rakamdan daha fazla olmadığından emin olun." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Geçerli bir tarih girin." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." -msgstr "Geçerli bir zaman girin." +msgstr "Geçerli bir saat girin." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." -msgstr "Geçerli bir tarih/zaman girin." +msgstr "Geçerli bir tarih/saat girin." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." -msgstr "Dosya gönderilmedi. Formdaki kodlama türünü kontrol edin." +msgstr "Hiç dosya gönderilmedi. Formdaki kodlama türünü kontrol edin." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." -msgstr "Hiçbir dosya gönderilmedi." +msgstr "Hiç dosya gönderilmedi." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Gönderilen dosya boş." -#: 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] "" -"Bu dosya adının en fazla %(max)d karakterden oluştuğundan emin olun (şu anki " -"karakter sayısı: %(length)d)." +"Bu dosya adının en fazla %(max)d karaktere sahip olduğundan emin olun (şu an " +"%(length)d)." msgstr[1] "" -"Bu dosya adının en fazla %(max)d karakterden oluştuğundan emin olun (şu anki " -"karakter sayısı: %(length)d)." +"Bu dosya adının en fazla %(max)d karaktere sahip olduğundan emin olun (şu an " +"%(length)d)." -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "" -"Lütfen ya dosya seçin, ya da sıfırla kutucuğunu işaretleyin. İkisini aynı " -"anda yapmayın." +"Lütfen ya bir dosya gönderin ya da temizle işaretleme kutusunu işaretleyin, " +"ikisini aynı anda işaretlemeyin." -#: 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 "" -"Geçerli bir resim girin. Gönderdiğiniz dosya resim değil, ya da bozuk bir " -"dosya." +"Geçerli bir resim gönderin. Gönderdiğiniz dosya ya bir resim değildi ya da " +"bozulmuş bir resimdi." -#: 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 "Geçerli bir seçimde bulunun; %(value)s mevcut değerlerden biri değil." +msgstr "Geçerli bir seçenek seçin. %(value)s mevcut seçeneklerden biri değil." -#: 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 "Değer listesi giriniz." +msgstr "Değerlerin bir listesini girin." + +#: forms/fields.py:988 +msgid "Enter a complete value." +msgstr "Tam bir değer girin." #. 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 "(Gizli alan %(name)s) %(error)s" @@ -765,97 +812,101 @@ #. 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 verisi eksik veya tahrif edilmiş" +msgstr "ManagementForm verisi eksik ya da kurcalanmış." -#: 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] "Lütfen %d ya da daha az form gönderin." msgstr[1] "Lütfen %d ya da daha az form gönderin." -#: 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] "Lütfen %d ya da daha fazla form gönderin." +msgstr[1] "Lütfen %d ya da daha fazla form gönderin." + +#: forms/formsets.py:367 forms/formsets.py:369 msgid "Order" msgstr "Sıralama" -#: 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 "Lütfen %(field)s alanları için mükerrer kayıt problemini düzeltin." +msgstr "Lütfen %(field)s için kopya veriyi düzeltin." -#: forms/models.py:684 +#: forms/models.py:716 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -"Lütfen %(field)s alanı için mükerrer verileri düzeltin, bunlar eşsiz " -"olmalıdır." +"Lütfen %(field)s için benzersiz olmak zorunda olan, kopya veriyi düzeltin." -#: 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 "" -"Lütfen %(field_name)s alanı için mükerrer verileri düzeltin, bunlar " -"%(date_field)s alanı %(lookup)s sorgulamaları için eşsiz olmalıdır." +"Lütfen %(date_field)s içindeki %(lookup)s için benzersiz olmak zorunda olan " +"%(field_name)s için kopya veriyi düzeltin." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." -msgstr "Lütfen aşağıdaki mükerrer kayıtları düzeltin." +msgstr "Lütfen aşağıdaki kopya değerleri düzeltin." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." -msgstr "" -"İçeride belirtilmiş yabancı anahtar ebeveyin nesnenin birincil anahtarı ile " -"uyuşmadı." +msgstr "Satıriçi dış anahtar ana örnek birincil anahtarı ile eşleşmedi." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -"Geçerli bir seçimde bulunun; seçiminiz mevcut değerlerden birisi değil." +"Geçerli bir seçenek seçin. Bu seçenek, mevcut seçeneklerden biri değil." -#: 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\" birincil anahtar için geçerli bir değer değil." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" -"\"Ctrl\" (Mac'de \"Command\") tuşunu basılı tutularak birden fazla seçim " -"yapılabilir." +"Birden fazla seçmek için \"Ctrl\" veya Mac'teki \"Command\" tuşuna basılı " +"tutun." -#: 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 saat dilimine yorumlanamadı; bu belirsiz " -"olabilir ya da olmayabilir." +" %(datetime)s, %(current_timezone)s saat dilimi olarak yorumlanamadı; bu " +"belirsiz olabilir ya da mevcut olmayabilir." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" -msgstr "Geçerli" +msgstr "Şu anki" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" -msgstr "Düzenle" +msgstr "Değiştir" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" -msgstr "Sıfırla" +msgstr "Temizle" #: forms/widgets.py:546 msgid "Unknown" @@ -869,63 +920,63 @@ msgid "No" msgstr "Hayır" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "evet,hayır,olabilir" -#: 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[1] "%(size)d bayt" -#: 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 "ö.s." -#: utils/dateformat.py:48 +#: utils/dateformat.py:60 msgid "a.m." msgstr "ö.ö." -#: utils/dateformat.py:53 +#: utils/dateformat.py:65 msgid "PM" msgstr "ÖS" -#: utils/dateformat.py:54 +#: utils/dateformat.py:66 msgid "AM" msgstr "ÖÖ" -#: utils/dateformat.py:103 +#: utils/dateformat.py:149 msgid "midnight" msgstr "gece yarısı" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "öğlen" @@ -1109,12 +1160,12 @@ #: utils/dates.py:36 msgctxt "abbrev. month" msgid "June" -msgstr "Haziran" +msgstr "Haz." #: utils/dates.py:37 msgctxt "abbrev. month" msgid "July" -msgstr "Temmuz" +msgstr "Tem." #: utils/dates.py:38 msgctxt "abbrev. month" @@ -1201,145 +1252,189 @@ msgid "December" msgstr "Aralık" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Pillow da PIL de import edilemedi: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "PIL için '_imaging' modülü import edilemedi: %s" - -#: utils/ipv6.py:9 +#: utils/ipv6.py:10 msgid "This is not a valid IPv6 address." msgstr "Bu, geçerli bir IPv6 adresi değil." -#: 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 "ya da" #. 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 yıl" msgstr[1] "%d yıl" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d ay" msgstr[1] "%d ay" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d hafta" msgstr[1] "%d hafta" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d gün" msgstr[1] "%d gün" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d saat" msgstr[1] "%d saat" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d dakika" msgstr[1] "%d dakika" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "0 dakika" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Klasör indeksi görünümü kapalı." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "Yasak" + +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "CSRF doğrulaması başarısız oldu. İstek iptal edildi." -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" yok" +#: 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 "" +"Bu iletiyi görüyorsunuz çünkü bu HTTPS sitesi Web tarayıcınız tarafından " +"gönderilen 'Göndereni başlığı'nı gerektirir, ancak hiçbir şey gönderilmedi. " +"Bu başlık güvenlik nedenleri için gerekir, tarayıcınızın üçüncü parti " +"uygulamalar tarafından ele geçirilmediğinden emin olun." -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "%(directory)s indeksi" +#: 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 "" +"Eğer tarayıcınızı 'Göndereni' başlıklarını etkisizleştirmek için " +"yapılandırdıysanız, lütfen bunları, en azından bu site ya da HTTPS " +"bağlantıları veya 'aynı-kaynakta' olan istekler için yeniden etkinleştirin." + +#: 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 "" +"Bu iletiyi görüyorsunuz çünkü bu site, formları gönderdiğinizde bir CSRF " +"tanımlama bilgisini gerektirir. Bu tanımlama bilgisi güvenlik nedenleri için " +"gerekir, tarayıcınızın üçüncü parti uygulamalar tarafından ele " +"geçirilmediğinden emin olun." -#: views/generic/dates.py:42 +#: 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 "" +"Eğer tarayıcınızı tanımlama bilgilerini etkisizleştirmek için " +"yapılandırdıysanız, lütfen bunları, en azından bu site ya da 'aynı-kaynakta' " +"olan istekler için yeniden etkinleştirin." + +#: views/csrf.py:129 +msgid "More information is available with DEBUG=True." +msgstr "Daha fazla bilgi DEBUG=True ayarı ile mevcut olur." + +#: views/generic/dates.py:43 msgid "No year specified" msgstr "Yıl bilgisi belirtilmedi" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Ay bilgisi belirtilmedi" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Gün bilgisi belirtilmedi" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Hafta bilgisi belirtilmedi" -#: 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 "Mevcut %(verbose_name_plural)s kaydı bulunamadı" +msgstr "Mevcut %(verbose_name_plural)s yok" -#: 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 "" "Gelecek %(verbose_name_plural)s mevcut değil, çünkü %(class_name)s." -"allow_future değeri False olarak tanımlıdır." +"allow_future değeri False olarak tanımlı." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" -msgstr "Geçersiz tarih dizisi: '%(datestr)s', format: '%(format)s' " +msgstr "Geçersiz tarih dizgesi '%(datestr)s' verilen biçim '%(format)s'" #: views/generic/detail.py:54 #, python-format msgid "No %(verbose_name)s found matching the query" -msgstr "Sorguya uygun herhangi bir %(verbose_name)s bulunamadı" +msgstr "Sorguyla eşleşen hiç %(verbose_name)s bulunamadı" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." -msgstr "Sayfa 'sonuncu' değil, veya int'e çevirilemez." +msgstr "Sayfa 'sonuncu' değil, ya da bir int'e dönüştürülemez." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Geçersiz sayfa (%(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 boş ve '%(class_name)s.allow_empty' değeri False olarak tanımlı." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Dizin indekslerine burada izin verilmiyor." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" mevcut değil" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "%(directory)s indeksi" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/tt/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/tt/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/tt/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/tt/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/tt/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/tt/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,12 +2,13 @@ # # Translators: # Azat Khasanshin , 2011 +# v_ildar , 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: Tatar (http://www.transifex.com/projects/p/django/language/" "tt/)\n" @@ -26,6 +27,10 @@ msgstr "Гарәп теле" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Азәрбайҗан" @@ -78,323 +83,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 "" +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 "" +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" +#: 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 "" +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 "" +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 "" -#: 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 " @@ -404,7 +437,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 " @@ -414,247 +447,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 "Мондый %(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 "" +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 "" -#: 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 "Тыш ачкыч (тип бәйле кыр буенча билгеләнгән)" -#: 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." @@ -662,66 +701,70 @@ "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 "" @@ -729,40 +772,46 @@ #. 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 " @@ -771,48 +820,48 @@ "Зинһар, %(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\" (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 "Бушайтырга" @@ -828,62 +877,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 "көн уртасы" @@ -1159,111 +1208,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/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." @@ -1272,7 +1337,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 "Дөрес булмаган дата '%(datestr)s', бирелгән формат '%(format)s'" @@ -1282,16 +1347,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 "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/udm/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/udm/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/udm/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/udm/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/udm/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/udm/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: Udmurt (http://www.transifex.com/projects/p/django/language/" "udm/)\n" @@ -25,6 +25,10 @@ msgstr "Араб" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Азербайджан" @@ -77,319 +81,347 @@ 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 "" "Татчын букваос, лыдпусъёс, улӥ гож пусъёс но дефисъёс гинэ гожтыны яра." -#: 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 " @@ -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 "%(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 "но" -#: 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 "Бадӟым (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." @@ -655,63 +695,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 "" @@ -719,68 +763,74 @@ #. 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\", (яке, 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 " @@ -789,15 +839,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 "Али" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Тупатъяно" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Буш кароно" @@ -813,62 +863,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 "лымшор" @@ -1144,118 +1194,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 "%(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] "" -#: 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." -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 "" -#: 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 "" @@ -1265,16 +1331,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 "\"%(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/uk/formats.py python-django-1.7.4/django/conf/locale/uk/formats.py --- python-django-1.6.6/django/conf/locale/uk/formats.py 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/uk/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -12,14 +12,14 @@ 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 = 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/uk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/uk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/uk/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/uk/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/uk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/uk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Alexander Chernihov , 2014 # Boryslav Larin , 2011 # Jannis Leidel , 2011 -# Alex Bolotov , 2013 -# Roman Kozlovskiy , 2012 +# Max V. Stotsky , 2014 +# Oleksandr Bolotov , 2013-2014 +# Roman Kozlovskyi , 2012 # Sergiy Kuzmenko , 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-12 23:00+0000\n" -"Last-Translator: Alex Bolotov \n" +"POT-Creation-Date: 2014-08-23 14:10+0200\n" +"PO-Revision-Date: 2014-09-24 09:21+0000\n" +"Last-Translator: Alexander Chernihov \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/" "language/uk/)\n" "MIME-Version: 1.0\n" @@ -31,6 +33,10 @@ msgstr "Арабська" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Азербайджанська" @@ -83,322 +89,350 @@ 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 "Введіть коректну email адресу." -#: 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 " @@ -416,7 +450,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 " @@ -434,75 +468,85 @@ "Переконайтеся, що це значення містить не більше ніж %(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 повинне бути унікальним для %(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' значення має бути цілим числом." +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." +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." +"Значення '%(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 " @@ -510,11 +554,11 @@ 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[." @@ -523,155 +567,155 @@ "Значення '%(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 "'%(value)s' має бути десятковим числом." +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 "E-mail адреса" -#: 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' має бути числом з плаваючою комою." +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." +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]] " "format." msgstr "" -"Значення '%(value)s' має невірний формат. Воно має бути у форматі HH:MM[:ss[." -"uuuuuu]]." +"Значення '%(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]]), але це не " -"дійсний час." +"Значення '%(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 "Зовнішній ключ (тип визначається відповідно поля)" -#: 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." @@ -679,7 +723,7 @@ msgstr[1] "Переконайтеся, що загалом тут не більше ніж %(max)s цифер." msgstr[2] "Переконайтеся, що загалом тут не більше ніж %(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." @@ -690,7 +734,7 @@ msgstr[2] "" "Переконайтеся, що тут не більше ніж %(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." @@ -703,31 +747,31 @@ msgstr[2] "" "Переконайтеся, що тут не більше ніж %(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 "" @@ -742,13 +786,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." @@ -756,21 +800,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" @@ -778,15 +826,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 "ManagementForm даних відсутній або був підроблений" +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." @@ -794,27 +842,35 @@ msgstr[1] "Будь ласка, відправте %d або менше форм." msgstr[2] "Будь ласка, відправте %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 форми." +msgstr[2] "Будь ласка, відправте як мінімум %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 " @@ -823,33 +879,33 @@ "Будь ласка, виправте повторювані дані для поля %(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\" на Маку, щоб обрати більше " "однієї опції." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -858,15 +914,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 "Очистити" @@ -882,11 +938,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" @@ -894,52 +950,52 @@ msgstr[1] "%(size)d байти" msgstr[2] "%(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 "полудень" @@ -1215,36 +1271,26 @@ 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" @@ -1252,7 +1298,7 @@ msgstr[1] "%d років" msgstr[2] "%d років" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" @@ -1260,7 +1306,7 @@ msgstr[1] "%d місяців" msgstr[2] "%d місяців" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" @@ -1268,7 +1314,7 @@ msgstr[1] "%d тижнів" msgstr[2] "%d тижнів" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" @@ -1276,7 +1322,7 @@ msgstr[1] "%d днів" msgstr[2] "%d днів" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" @@ -1284,7 +1330,7 @@ msgstr[1] "%d часів" msgstr[2] "%d часів" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" @@ -1292,46 +1338,72 @@ msgstr[1] "%d хвилин" msgstr[2] "%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/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." @@ -1340,7 +1412,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'" @@ -1350,18 +1422,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" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/ur/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/ur/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/ur/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/ur/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/ur/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/ur/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,10 +4,10 @@ # Mansoorulhaq Mansoor , 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: Urdu (http://www.transifex.com/projects/p/django/language/" "ur/)\n" @@ -26,6 +26,10 @@ msgstr "عربی" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "" @@ -78,324 +82,352 @@ 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 ھے)%(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 @@ 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,248 +449,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 کا %(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 "سلسلۂ حروف (String) (%(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 "فائل کا راستہ(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 "نقطہ اعشاریہ والا نمبر" -#: 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 "یو آر ایل" -#: 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 "بیرونی کلید (FK( (قسم متعلقہ خانے سے متعین ھو گی)" -#: 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." @@ -667,31 +706,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 "" @@ -699,11 +738,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 "براہ مھربانی فائل پیش کریں یا Clear checkbox منتخب کریں۔ نہ کہ دونوں۔" -#: 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." @@ -711,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 "" @@ -733,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 "ترتیب" -#: 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,46 +826,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 "ان لائن بیرونی کلید (FK) آبائی پرائمری کلید (PK) سے نھیں ملتی۔" -#: 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\" دبا کر رکھیں۔ یا Mac OS پر " "\"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 "صاف کریں" @@ -831,63 +881,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 "دوپہر" @@ -1163,124 +1213,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 "" @@ -1290,16 +1356,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/vi/formats.py python-django-1.7.4/django/conf/locale/vi/formats.py --- python-django-1.6.6/django/conf/locale/vi/formats.py 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/vi/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 = 'H:i:s d-m-Y' -# 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/vi/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/vi/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/vi/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/vi/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/vi/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/vi/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,18 +2,19 @@ # # Translators: # Jannis Leidel , 2011 -# ppanhh , 2013 -# Lê Thanh , 2013 +# Anh Phan , 2013 +# Thanh Le Viet , 2013 # Tran , 2011 # Tran Van , 2011,2013 # Vuong Nguyen , 2011 +# xgenvn , 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-07 19:11+0000\n" +"Last-Translator: xgenvn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/" "language/vi/)\n" "MIME-Version: 1.0\n" @@ -31,6 +32,10 @@ msgstr "Tiếng Ả Rập" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "Asturian" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "Tiếng Azerbaijan" @@ -83,318 +88,346 @@ msgstr "Tiếng Anh" #: conf/global_settings.py:66 +msgid "Australian English" +msgstr "Tiếng Anh ở Úc" + +#: conf/global_settings.py:67 msgid "British English" msgstr "British English" -#: conf/global_settings.py:67 +#: conf/global_settings.py:68 msgid "Esperanto" msgstr "Quốc Tế Ngữ" -#: conf/global_settings.py:68 +#: conf/global_settings.py:69 msgid "Spanish" msgstr "Tiếng Tây Ban Nha" -#: 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 "Tiếng Tây Ban Nha-Nicaragua" -#: conf/global_settings.py:72 +#: conf/global_settings.py:73 msgid "Venezuelan Spanish" msgstr "Tiếng Vê-nê-du-ê-la" -#: conf/global_settings.py:73 +#: conf/global_settings.py:74 msgid "Estonian" msgstr "Tiếng Estonia" -#: conf/global_settings.py:74 +#: conf/global_settings.py:75 msgid "Basque" msgstr "Tiếng Baxcơ" -#: conf/global_settings.py:75 +#: conf/global_settings.py:76 msgid "Persian" msgstr "Tiếng Ba Tư" -#: conf/global_settings.py:76 +#: conf/global_settings.py:77 msgid "Finnish" msgstr "Tiếng Phần Lan" -#: conf/global_settings.py:77 +#: conf/global_settings.py:78 msgid "French" msgstr "Tiếng Pháp" -#: conf/global_settings.py:78 +#: conf/global_settings.py:79 msgid "Frisian" msgstr "Tiếng Frisco" -#: conf/global_settings.py:79 +#: conf/global_settings.py:80 msgid "Irish" msgstr "Tiếng Ai-len" -#: conf/global_settings.py:80 +#: conf/global_settings.py:81 msgid "Galician" msgstr "Tiếng Pháp cổ" -#: conf/global_settings.py:81 +#: conf/global_settings.py:82 msgid "Hebrew" msgstr "Tiếng Do Thái cổ" -#: conf/global_settings.py:82 +#: conf/global_settings.py:83 msgid "Hindi" msgstr "Tiếng Hindi" -#: conf/global_settings.py:83 +#: conf/global_settings.py:84 msgid "Croatian" msgstr "Tiếng Croatia" -#: conf/global_settings.py:84 +#: conf/global_settings.py:85 msgid "Hungarian" msgstr "Tiếng Hung-ga-ri" -#: conf/global_settings.py:85 +#: conf/global_settings.py:86 msgid "Interlingua" msgstr "Tiếng Khoa học Quốc tế" -#: conf/global_settings.py:86 +#: conf/global_settings.py:87 msgid "Indonesian" msgstr "Tiếng In-đô-nê-xi-a" -#: conf/global_settings.py:87 +#: conf/global_settings.py:88 +msgid "Ido" +msgstr "Ido" + +#: conf/global_settings.py:88 msgid "Icelandic" msgstr "Tiếng Aixơlen" -#: conf/global_settings.py:88 +#: conf/global_settings.py:89 msgid "Italian" msgstr "Tiếng Ý" -#: conf/global_settings.py:89 +#: conf/global_settings.py:90 msgid "Japanese" msgstr "Tiếng Nhật Bản" -#: 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 "Tiếng Kazakh" -#: conf/global_settings.py:92 +#: conf/global_settings.py:93 msgid "Khmer" msgstr "Tiếng Khơ-me" -#: conf/global_settings.py:93 +#: conf/global_settings.py:94 msgid "Kannada" msgstr "Tiếng Kannada" -#: conf/global_settings.py:94 +#: conf/global_settings.py:95 msgid "Korean" msgstr "Tiếng Hàn Quốc" -#: conf/global_settings.py:95 +#: conf/global_settings.py:96 msgid "Luxembourgish" msgstr "Tiếng Luxembourg" -#: conf/global_settings.py:96 +#: conf/global_settings.py:97 msgid "Lithuanian" msgstr "Tiếng Lat-vi" -#: conf/global_settings.py:97 +#: conf/global_settings.py:98 msgid "Latvian" msgstr "Ngôn ngữ vùng Bantic" -#: conf/global_settings.py:98 +#: conf/global_settings.py:99 msgid "Macedonian" msgstr "Tiếng Maxêđôni" -#: conf/global_settings.py:99 +#: conf/global_settings.py:100 msgid "Malayalam" msgstr "Tiếng Malayalam" -#: conf/global_settings.py:100 +#: conf/global_settings.py:101 msgid "Mongolian" msgstr "Tiếng Mông Cổ" -#: conf/global_settings.py:101 +#: conf/global_settings.py:102 +msgid "Marathi" +msgstr "Marathi" + +#: conf/global_settings.py:102 msgid "Burmese" msgstr "My-an-ma" -#: conf/global_settings.py:102 +#: conf/global_settings.py:103 msgid "Norwegian Bokmal" msgstr "Tiếng Na Uy Bokmål" -#: conf/global_settings.py:103 +#: conf/global_settings.py:104 msgid "Nepali" msgstr "Nê-pan" -#: conf/global_settings.py:104 +#: conf/global_settings.py:105 msgid "Dutch" msgstr "Tiếng Hà Lan" -#: conf/global_settings.py:105 +#: conf/global_settings.py:106 msgid "Norwegian Nynorsk" msgstr "Tiếng Na Uy Nynorsk" -#: conf/global_settings.py:106 +#: conf/global_settings.py:107 msgid "Ossetic" msgstr "Ô-sét-ti-a" -#: 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 "Tiếng Ba lan" -#: conf/global_settings.py:109 +#: conf/global_settings.py:110 msgid "Portuguese" msgstr "Tiếng Bồ Đào Nha" -#: 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 "Tiếng Ru-ma-ni" -#: conf/global_settings.py:112 +#: conf/global_settings.py:113 msgid "Russian" msgstr "Tiếng Nga" -#: conf/global_settings.py:113 +#: conf/global_settings.py:114 msgid "Slovak" msgstr "Ngôn ngữ Slô-vac" -#: conf/global_settings.py:114 +#: conf/global_settings.py:115 msgid "Slovenian" msgstr "Tiếng Slôven" -#: conf/global_settings.py:115 +#: conf/global_settings.py:116 msgid "Albanian" msgstr "Tiếng Albania" -#: conf/global_settings.py:116 +#: conf/global_settings.py:117 msgid "Serbian" msgstr "Tiếng Xéc-bi" -#: 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 "Tiếng Thụy Điển" -#: conf/global_settings.py:119 +#: conf/global_settings.py:120 msgid "Swahili" msgstr "Xì-qua-hi-đi thuộc ngôn ngữ Bantu" -#: conf/global_settings.py:120 +#: conf/global_settings.py:121 msgid "Tamil" msgstr "Tiếng Ta-min" -#: 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 "Tiếng Thái" -#: conf/global_settings.py:123 +#: conf/global_settings.py:124 msgid "Turkish" msgstr "Tiếng Thổ Nhĩ Kỳ" -#: conf/global_settings.py:124 +#: conf/global_settings.py:125 msgid "Tatar" msgstr "Tác-ta" -#: 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 "Tiếng 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 "Tiếng Việt Nam" -#: conf/global_settings.py:129 +#: conf/global_settings.py:130 conf/global_settings.py:131 msgid "Simplified Chinese" msgstr "Tiếng Tàu giản thể" -#: conf/global_settings.py:130 +#: conf/global_settings.py:132 conf/global_settings.py:133 msgid "Traditional Chinese" msgstr "Tiếng Tàu truyền thống" +#: contrib/sitemaps/apps.py:8 +msgid "Site Maps" +msgstr "Bản đồ trang web" + +#: contrib/staticfiles/apps.py:8 +msgid "Static Files" +msgstr "Tập tin tĩnh" + +#: contrib/syndication/apps.py:8 +msgid "Syndication" +msgstr "Syndication" + +#: contrib/webdesign/apps.py:8 +msgid "Web Design" +msgstr "Thiết kế Web" + #: core/validators.py:21 msgid "Enter a valid value." msgstr "Nhập một giá trị hợp lệ." -#: core/validators.py:53 forms/fields.py:650 +#: core/validators.py:77 forms/fields.py:675 msgid "Enter a valid URL." msgstr "Nhập một URL hợp lệ." -#: core/validators.py:79 +#: core/validators.py:115 msgid "Enter a valid integer." -msgstr "" +msgstr "Nhập một số nguyên hợp lệ." -#: core/validators.py:83 +#: core/validators.py:120 msgid "Enter a valid email address." msgstr "Nhập địa chỉ email." -#: core/validators.py:131 +#: core/validators.py:185 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "Nhập một 'slug' hợp lệ gồm chữ cái, số, gạch dưới và gạch nối." -#: core/validators.py:134 core/validators.py:153 +#: core/validators.py:188 core/validators.py:207 msgid "Enter a valid IPv4 address." msgstr "Nhập một địa chỉ IPv4 hợp lệ." -#: core/validators.py:139 core/validators.py:154 +#: core/validators.py:193 core/validators.py:208 msgid "Enter a valid IPv6 address." msgstr "Nhập địa chỉ IPv6 hợp lệ" -#: 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 "Nhập địa chỉ IPv4 hoặc IPv6 hợp lệ" -#: 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 "Chỉ nhập chữ số, cách nhau bằng dấu phẩy." -#: core/validators.py:181 +#: core/validators.py:236 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "Đảm bảo giá trị này là %(limit_value)s (nó là %(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 "Đảm bảo giá trị này là nhỏ hơn hoặc bằng với %(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 "Đảm bảo giá trị này lớn hơn hoặc bằng với %(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 +438,7 @@ msgstr[0] "" "Giá trị này phải có ít nhất %(limit_value)d kí tự (hiện có %(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,245 +449,256 @@ msgstr[0] "" "Giá trị này chỉ có tối đa %(limit_value)d kí tự (hiện có %(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 phải là duy nhất cho %(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 "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 có %(field_label)s đã tồn tại." +msgid "%(model_name)s with this %(field_labels)s already exists." +msgstr "%(model_name)s với thông tin %(field_labels)s đã tồn tại" -#: 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 "Giá trị %(value)r không phải là lựa chọn hợp lệ." -#: db/models/fields/__init__.py:81 +#: db/models/fields/__init__.py:105 msgid "This field cannot be null." msgstr "Trường này không thể để trống." -#: db/models/fields/__init__.py:82 +#: db/models/fields/__init__.py:106 msgid "This field cannot be blank." msgstr "Trường này không được để trắng." -#: 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 có %(field_label)s đã tồn tại." + +#. 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 phải là duy nhất %(date_field_label)s %(lookup_type)s." + +#: db/models/fields/__init__.py:116 #, python-format msgid "Field of type: %(field_type)s" msgstr "Trường thuộc dạng: %(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 "Số nguyên" -#: 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' phải là một số nguyên" -#: 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' phải là True hoặc False (Đúng hoặc Sai)" -#: db/models/fields/__init__.py:627 +#: db/models/fields/__init__.py:928 msgid "Boolean (Either True or False)" msgstr "Boolean (hoặc là Đúng hoặc là Sai)" -#: db/models/fields/__init__.py:679 +#: db/models/fields/__init__.py:1004 #, python-format msgid "String (up to %(max_length)s)" msgstr "Chuỗi (dài đến %(max_length)s ký tự )" -#: db/models/fields/__init__.py:707 +#: db/models/fields/__init__.py:1065 msgid "Comma-separated integers" msgstr "Các số nguyên được phân cách bằng dấu phẩy" -#: 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 "" +msgstr "'%(value)s' phải là dạng ngày (ví dụ 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' có dạng là ngày (YYYY-MM-DD) tuy nhiên không phải là ngày hợp lệ." -#: db/models/fields/__init__.py:726 +#: db/models/fields/__init__.py:1085 msgid "Date (without time)" msgstr "Ngày (không có giờ)" -#: 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' không hợp lệ, giá trị phải có dạng: YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." -#: 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 "Ngày (có giờ)" -#: 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 "Số thập phân" -#: db/models/fields/__init__.py:983 +#: db/models/fields/__init__.py:1444 msgid "Email address" msgstr "Địa chỉ email" -#: db/models/fields/__init__.py:1002 +#: db/models/fields/__init__.py:1470 msgid "File path" msgstr "Đường dẫn tắt tới 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 "Giá trị dấu chấm động" -#: 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 "Địa chỉ IPv4" -#: db/models/fields/__init__.py:1128 +#: db/models/fields/__init__.py:1668 msgid "IP address" msgstr "Địa chỉ 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 "Luận lý (Có thể Đúng, Sai hoặc Không cái nào đúng)" -#: db/models/fields/__init__.py:1229 +#: db/models/fields/__init__.py:1809 msgid "Positive integer" msgstr "Số nguyên dương" -#: db/models/fields/__init__.py:1240 +#: db/models/fields/__init__.py:1821 msgid "Positive small integer" msgstr "Số nguyên dương nhỏ" -#: db/models/fields/__init__.py:1252 +#: db/models/fields/__init__.py:1834 #, python-format msgid "Slug (up to %(max_length)s)" msgstr "Slug(lên đến %(max_length)s)" -#: db/models/fields/__init__.py:1270 +#: db/models/fields/__init__.py:1863 msgid "Small integer" msgstr "Số nguyên nhỏ" -#: db/models/fields/__init__.py:1276 +#: db/models/fields/__init__.py:1870 msgid "Text" msgstr "Đoạn văn" -#: 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 "Giờ" -#: db/models/fields/__init__.py:1368 +#: db/models/fields/__init__.py:1977 msgid "URL" msgstr "Đường dẫn URL" -#: db/models/fields/__init__.py:1384 +#: db/models/fields/__init__.py:2000 msgid "Raw binary data" msgstr "Dữ liệu nhị phân " -#: 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 "Khóa ngoại (kiểu được xác định bởi trường liên hệ)" -#: db/models/fields/related.py:1271 +#: db/models/fields/related.py:1773 msgid "One-to-one relationship" msgstr "Mối quan hệ một-một" -#: db/models/fields/related.py:1338 +#: db/models/fields/related.py:1843 msgid "Many-to-many relationship" msgstr "Mối quan hệ nhiều-nhiều" -#: forms/fields.py:56 +#: forms/fields.py:55 msgid "This field is required." msgstr "Trường này là bắt buộc." -#: forms/fields.py:225 +#: forms/fields.py:236 msgid "Enter a whole number." msgstr "Nhập một số tổng thể." -#: forms/fields.py:266 forms/fields.py:294 +#: forms/fields.py:279 forms/fields.py:316 msgid "Enter a number." msgstr "Nhập một số." -#: 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] "Đảm bảo rằng tối đa không có nhiều hơn %(max)s 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] "Hãy chắc chắn rằng không có nhiều hơn %(max)s chữ số thập phân." -#: 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,42 +708,42 @@ "Hãy chắc chắn rằng không có nhiều hơn %(max)s chữ số trước dấu phẩy thập " "phân." -#: forms/fields.py:415 forms/fields.py:1088 +#: forms/fields.py:437 forms/fields.py:1139 msgid "Enter a valid date." msgstr "Nhập một ngày hợp lệ." -#: forms/fields.py:439 forms/fields.py:1089 +#: forms/fields.py:461 forms/fields.py:1140 msgid "Enter a valid time." msgstr "Nhập một thời gian hợp lệ." -#: forms/fields.py:461 +#: forms/fields.py:483 msgid "Enter a valid date/time." msgstr "Nhập một ngày/thời gian hợp lệ." -#: forms/fields.py:539 +#: forms/fields.py:564 msgid "No file was submitted. Check the encoding type on the form." msgstr "Không có tập tin nào được gửi. Hãy kiểm tra kiểu mã hóa của biểu mẫu." -#: forms/fields.py:540 +#: forms/fields.py:565 msgid "No file was submitted." msgstr "Không có tập tin nào được gửi." -#: forms/fields.py:541 +#: forms/fields.py:566 msgid "The submitted file is empty." msgstr "Tập tin được gửi là rỗng." -#: 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] "Tên tệp tin có tối đa %(max)d kí tự (Hiện có %(length)d)" -#: forms/fields.py:546 +#: forms/fields.py:571 msgid "Please either submit a file or check the clear checkbox, not both." msgstr "Vui lòng gửi một tập tin hoặc để ô chọn trắng, không chọn cả hai." -#: 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,23 +751,27 @@ "Hãy tải lên một hình ảnh hợp lệ. Tập tin mà bạn đã tải không phải là hình " "ảnh hoặc đã bị hư hỏng." -#: 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 "" "Hãy chọn một lựa chọn hợp lệ. %(value)s không phải là một trong các lựa chọn " "khả thi." -#: 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 "Nhập một danh sách giá trị." +#: 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 "(Trường ẩn %(name)s) %(error)s" @@ -731,39 +779,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] "Vui lòng đệ trình %d hoặc ít các mẫu đơn hơn." -#: 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 "Thứ tự" -#: forms/formsets.py:354 +#: forms/formsets.py:371 msgid "Delete" msgstr "Xóa" -#: forms/models.py:680 +#: forms/models.py:712 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "Hãy sửa các dữ liệu trùng lặp cho %(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 "Hãy sửa các dữ liệu trùng lặp cho %(field)s, mà phải là duy nhất." -#: forms/models.py:690 +#: forms/models.py:722 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " @@ -772,31 +826,31 @@ "Hãy sửa các dữ liệu trùng lặp cho %(field_name)s mà phải là duy nhất cho " "%(lookup)s tại %(date_field)s ." -#: forms/models.py:698 +#: forms/models.py:730 msgid "Please correct the duplicate values below." msgstr "Hãy sửa các giá trị trùng lặp dưới đây." -#: forms/models.py:986 +#: forms/models.py:1028 msgid "The inline foreign key did not match the parent instance primary key." msgstr "Khóa ngoại không tương ứng với khóa chính của đối tượng cha." -#: forms/models.py:1050 +#: forms/models.py:1094 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" "Hãy chọn một lựa chọn hợp lệ. Lựa chọn đó không phải là một trong các lựa " "chọn khả thi." -#: 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\" không phải là giá trị hợp lệ cho khóa chính." -#: forms/models.py:1158 +#: forms/models.py:1205 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "Giữ \"Control\", hoặc \"Command\" trên Mac, để chọn nhiều hơn một." -#: forms/util.py:83 +#: forms/utils.py:148 #, python-format msgid "" "%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " @@ -805,15 +859,15 @@ "%(datetime)s không thích hợp với khu vực thời gian %(current_timezone)s; " "phần này có thể còn mơ hồ chưa rõ nghĩa hoặc không hề tồn tại." -#: forms/widgets.py:326 +#: forms/widgets.py:350 msgid "Currently" msgstr "Hiện nay" -#: forms/widgets.py:327 +#: forms/widgets.py:351 msgid "Change" msgstr "Thay đổi" -#: forms/widgets.py:328 +#: forms/widgets.py:352 msgid "Clear" msgstr "Xóa" @@ -829,62 +883,62 @@ msgid "No" msgstr "Không" -#: template/defaultfilters.py:784 +#: template/defaultfilters.py:855 msgid "yes,no,maybe" msgstr "Có, Không, Có thể" -#: 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" -#: 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 "chiều" -#: utils/dateformat.py:54 +#: utils/dateformat.py:66 msgid "AM" msgstr "sáng" -#: utils/dateformat.py:103 +#: utils/dateformat.py:149 msgid "midnight" msgstr "Nửa đêm" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "Buổi trưa" @@ -1160,111 +1214,127 @@ msgid "December" msgstr "Tháng mười hai" -#: utils/image.py:105 -#, python-format -msgid "Neither Pillow nor PIL could be imported: %s" -msgstr "Thư viện xử lý ảnh Pillow hoặc PIL không được import: %s" - -#: utils/image.py:127 -#, python-format -msgid "The '_imaging' module for the PIL could not be imported: %s" -msgstr "Mô đun '_imaging' cho PIL không được imported: '%s'" - -#: 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 "hoặc" #. 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 năm" -#: utils/timesince.py:25 +#: utils/timesince.py:26 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d tháng" -#: utils/timesince.py:26 +#: utils/timesince.py:27 #, python-format msgid "%d week" msgid_plural "%d weeks" msgstr[0] "%d tuần" -#: utils/timesince.py:27 +#: utils/timesince.py:28 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d ngày" -#: utils/timesince.py:28 +#: utils/timesince.py:29 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d giờ" -#: utils/timesince.py:29 +#: utils/timesince.py:30 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d phút" -#: utils/timesince.py:45 +#: utils/timesince.py:46 msgid "0 minutes" msgstr "0 phút" -#: views/static.py:56 -msgid "Directory indexes are not allowed here." -msgstr "Tại đây không cho phép đánh số chỉ mục dành cho thư mục." +#: views/csrf.py:105 +msgid "Forbidden" +msgstr "" -#: views/static.py:58 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" không tồn tại" +#: views/csrf.py:106 +msgid "CSRF verification failed. Request aborted." +msgstr "" -#: views/static.py:99 -#, python-format -msgid "Index of %(directory)s" -msgstr "Index của %(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 "Không có năm xác định" -#: views/generic/dates.py:98 +#: views/generic/dates.py:99 msgid "No month specified" msgstr "Không có tháng xác định" -#: views/generic/dates.py:157 +#: views/generic/dates.py:158 msgid "No day specified" msgstr "Không có ngày xác định" -#: views/generic/dates.py:213 +#: views/generic/dates.py:214 msgid "No week specified" msgstr "Không có tuần xác định" -#: 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 "Không có %(verbose_name_plural)s phù hợp" -#: views/generic/dates.py:649 +#: views/generic/dates.py:650 #, python-format msgid "" "Future %(verbose_name_plural)s not available because %(class_name)s." @@ -1273,7 +1343,7 @@ "%(verbose_name_plural)s trong tương lai không có sẵn vì %(class_name)s." "allow_future là False." -#: views/generic/dates.py:681 +#: views/generic/dates.py:682 #, python-format msgid "Invalid date string '%(datestr)s' given format '%(format)s'" msgstr "Chuỗi ngày không hợp lệ ' %(datestr)s' định dạng bởi '%(format)s'" @@ -1283,17 +1353,31 @@ msgid "No %(verbose_name)s found matching the query" msgstr "Không có %(verbose_name)s tìm thấy phù hợp với truy vấn" -#: views/generic/list.py:54 +#: views/generic/list.py:62 msgid "Page is not 'last', nor can it be converted to an int." msgstr "" "Trang không phải là 'nhất', và cũng không nó có thể được chuyển đổi sang int." -#: views/generic/list.py:59 +#: views/generic/list.py:67 #, python-format msgid "Invalid page (%(page_number)s): %(message)s" msgstr "Trang không hợp lệ (%(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 "Danh sách rỗng và '%(class_name)s.allow_empty' là sai." + +#: views/static.py:54 +msgid "Directory indexes are not allowed here." +msgstr "Tại đây không cho phép đánh số chỉ mục dành cho thư mục." + +#: views/static.py:56 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "\"%(path)s\" không tồn tại" + +#: views/static.py:97 +#, python-format +msgid "Index of %(directory)s" +msgstr "Index của %(directory)s" diff -Nru python-django-1.6.6/django/conf/locale/zh_CN/formats.py python-django-1.7.4/django/conf/locale/zh_CN/formats.py --- python-django-1.6.6/django/conf/locale/zh_CN/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_CN/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -5,20 +5,41 @@ # 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 = +DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 +TIME_FORMAT = 'H:i' # 20:45 +DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +YEAR_MONTH_FORMAT = 'Y年n月' # 2016年9月 +MONTH_DAY_FORMAT = 'm月j日' # 9月5日 +SHORT_DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 +SHORT_DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +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 = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +DATE_INPUT_FORMATS = ( + '%Y/%m/%d', # '2016/09/05' + '%Y-%m-%d', # '2016-09-05' + '%Y年%n月%j日', # '2016年9月5日' +) + +TIME_INPUT_FORMATS = ( + '%H:%M', # '20:45' + '%H:%M:%S', # '20:45:29' + '%H:%M:%S.%f', # '20:45:29.000200' +) + +DATETIME_INPUT_FORMATS = ( + '%Y/%m/%d %H:%M', # '2016/09/05 20:45' + '%Y-%m-%d %H:%M', # '2016-09-05 20:45' + '%Y年%n月%j日 %H:%M', # '2016年9月5日 14:45' + '%Y/%m/%d %H:%M:%S', # '2016/09/05 20:45:29' + '%Y-%m-%d %H:%M:%S', # '2016-09-05 20:45:29' + '%Y年%n月%j日 %H:%M:%S', # '2016年9月5日 20:45:29' + '%Y/%m/%d %H:%M:%S.%f', # '2016/09/05 20:45:29.000200' + '%Y-%m-%d %H:%M:%S.%f', # '2016-09-05 20:45:29.000200' + '%Y年%n月%j日 %H:%n:%S.%f', # '2016年9月5日 20:45:29.000200' +) + +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = '' +NUMBER_GROUPING = 4 Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/zh_CN/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/zh_CN/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/zh_CN/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/zh_CN/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_CN/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,19 +3,23 @@ # Translators: # Daniel Duan , 2013 # Jannis Leidel , 2011 +# Kevin Sze , 2012 # Lele Long , 2011 +# ouyanghongyu , 2014 # pylemon , 2013 # slene , 2011 +# Sun Liwen , 2014 +# Xiang Yu , 2014 # Yin Jifeng , 2013 # Ziang Song , 2011-2012 -# Kevin Shi , 2012 +# Kevin Sze , 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-09-04 10:36+0000\n" +"Last-Translator: ouyanghongyu \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -33,6 +37,10 @@ msgstr "阿拉伯语" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "阿塞拜疆语" @@ -85,318 +93,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 "输入一个合法的Email地址." -#: 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 " @@ -407,7 +443,7 @@ msgstr[0] "" "确保该变量至少包含 %(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,245 +454,253 @@ msgstr[0] "" "确保该变量包含不超过 %(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 "" -#: 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 "布尔值（真或假）" -#: 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 "布尔值（真、假或无)" -#: 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]] " "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] "确认总共不超过 %(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." @@ -664,62 +708,66 @@ "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 "" "Ensure this filename has at most %(max)d characters (it has %(length)d)." 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." 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 "" +msgstr ":" -#: forms/forms.py:159 +#: forms/forms.py:192 #, python-format msgid "(Hidden field %(name)s) %(error)s" msgstr "(隐藏字段 %(name)s) %(error)s" @@ -727,39 +775,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 "" +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 个表格。" -#: 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,29 +822,29 @@ "请修正%(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 " @@ -799,15 +853,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 "清除" @@ -823,62 +877,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 "午夜" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "中午" @@ -1154,111 +1208,127 @@ 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 "无法导入 PIL 的 '_imaging' 模块: %s" - -#: 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." -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 "CSRF验证失败. 相应中断." -#: 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." @@ -1267,26 +1337,40 @@ "因为 %(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 "日期文字 '%(datestr)s' 不匹配格式 '%(format)s'" +msgstr "日期字符串 '%(datestr)s' 与格式 '%(format)s' 不匹配" #: views/generic/detail.py:54 #, python-format 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/zh_Hans/formats.py python-django-1.7.4/django/conf/locale/zh_Hans/formats.py --- python-django-1.6.6/django/conf/locale/zh_Hans/formats.py 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_Hans/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,45 @@ +# -*- 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 = 'Y年n月j日' # 2016年9月5日 +TIME_FORMAT = 'H:i' # 20:45 +DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +YEAR_MONTH_FORMAT = 'Y年n月' # 2016年9月 +MONTH_DAY_FORMAT = 'm月j日' # 9月5日 +SHORT_DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 +SHORT_DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +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', # '2016/09/05' + '%Y-%m-%d', # '2016-09-05' + '%Y年%n月%j日', # '2016年9月5日' +) + +TIME_INPUT_FORMATS = ( + '%H:%M', # '20:45' + '%H:%M:%S', # '20:45:29' + '%H:%M:%S.%f', # '20:45:29.000200' +) + +DATETIME_INPUT_FORMATS = ( + '%Y/%m/%d %H:%M', # '2016/09/05 20:45' + '%Y-%m-%d %H:%M', # '2016-09-05 20:45' + '%Y年%n月%j日 %H:%M', # '2016年9月5日 14:45' + '%Y/%m/%d %H:%M:%S', # '2016/09/05 20:45:29' + '%Y-%m-%d %H:%M:%S', # '2016-09-05 20:45:29' + '%Y年%n月%j日 %H:%M:%S', # '2016年9月5日 20:45:29' + '%Y/%m/%d %H:%M:%S.%f', # '2016/09/05 20:45:29.000200' + '%Y-%m-%d %H:%M:%S.%f', # '2016-09-05 20:45:29.000200' + '%Y年%n月%j日 %H:%n:%S.%f', # '2016年9月5日 20:45:29.000200' +) + +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = '' +NUMBER_GROUPING = 4 Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/zh_Hans/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/zh_Hans/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/zh_Hans/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/zh_Hans/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_Hans/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,1224 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Jannis Leidel , 2011. +# Kevin Shi , 2012. +# Lele Long , 2011. +# slene , 2011. +# Ziang Song , 2011, 2012. +msgid "" +msgstr "" +"Project-Id-Version: Django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-01-01 16:10+0100\n" +"PO-Revision-Date: 2013-01-02 08:47+0000\n" +"Last-Translator: 磊 施 \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" +"language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: conf/global_settings.py:48 +msgid "Afrikaans" +msgstr "" + +#: conf/global_settings.py:49 +msgid "Arabic" +msgstr "阿拉伯语" + +#: conf/global_settings.py:50 +msgid "Azerbaijani" +msgstr "阿塞拜疆" + +#: conf/global_settings.py:51 +msgid "Bulgarian" +msgstr "保加利亚语" + +#: conf/global_settings.py:52 +msgid "Belarusian" +msgstr "" + +#: conf/global_settings.py:53 +msgid "Bengali" +msgstr "孟加拉语" + +#: conf/global_settings.py:54 +msgid "Breton" +msgstr "" + +#: conf/global_settings.py:55 +msgid "Bosnian" +msgstr "波斯尼亚语" + +#: conf/global_settings.py:56 +msgid "Catalan" +msgstr "加泰罗尼亚语" + +#: conf/global_settings.py:57 +msgid "Czech" +msgstr "捷克语" + +#: conf/global_settings.py:58 +msgid "Welsh" +msgstr "威尔士语" + +#: conf/global_settings.py:59 +msgid "Danish" +msgstr "丹麦语" + +#: conf/global_settings.py:60 +msgid "German" +msgstr "德语" + +#: conf/global_settings.py:61 +msgid "Greek" +msgstr "希腊语" + +#: conf/global_settings.py:62 +msgid "English" +msgstr "英语" + +#: conf/global_settings.py:63 +msgid "British English" +msgstr "英国英语" + +#: conf/global_settings.py:64 +msgid "Esperanto" +msgstr "世界语" + +#: conf/global_settings.py:65 +msgid "Spanish" +msgstr "西班牙语" + +#: conf/global_settings.py:66 +msgid "Argentinian Spanish" +msgstr "阿根廷西班牙语" + +#: conf/global_settings.py:67 +msgid "Mexican Spanish" +msgstr "墨西哥西班牙语" + +#: conf/global_settings.py:68 +msgid "Nicaraguan Spanish" +msgstr "尼加拉瓜西班牙语" + +#: conf/global_settings.py:69 +msgid "Venezuelan Spanish" +msgstr "" + +#: conf/global_settings.py:70 +msgid "Estonian" +msgstr "爱沙尼亚语" + +#: conf/global_settings.py:71 +msgid "Basque" +msgstr "巴斯克语" + +#: conf/global_settings.py:72 +msgid "Persian" +msgstr "波斯语" + +#: conf/global_settings.py:73 +msgid "Finnish" +msgstr "芬兰语" + +#: conf/global_settings.py:74 +msgid "French" +msgstr "法语" + +#: conf/global_settings.py:75 +msgid "Frisian" +msgstr "夫里斯兰语" + +#: conf/global_settings.py:76 +msgid "Irish" +msgstr "爱尔兰语" + +#: conf/global_settings.py:77 +msgid "Galician" +msgstr "加利西亚语" + +#: conf/global_settings.py:78 +msgid "Hebrew" +msgstr "希伯来语" + +#: conf/global_settings.py:79 +msgid "Hindi" +msgstr "北印度语" + +#: conf/global_settings.py:80 +msgid "Croatian" +msgstr "克罗地亚语" + +#: conf/global_settings.py:81 +msgid "Hungarian" +msgstr "匈牙利语" + +#: conf/global_settings.py:82 +msgid "Interlingua" +msgstr "" + +#: conf/global_settings.py:83 +msgid "Indonesian" +msgstr "印尼语" + +#: conf/global_settings.py:84 +msgid "Icelandic" +msgstr "冰岛语" + +#: conf/global_settings.py:85 +msgid "Italian" +msgstr "意大利语" + +#: conf/global_settings.py:86 +msgid "Japanese" +msgstr "日语" + +#: conf/global_settings.py:87 +msgid "Georgian" +msgstr "格鲁吉亚语" + +#: conf/global_settings.py:88 +msgid "Kazakh" +msgstr "哈萨克语" + +#: conf/global_settings.py:89 +msgid "Khmer" +msgstr "高棉语" + +#: conf/global_settings.py:90 +msgid "Kannada" +msgstr "埃纳德语" + +#: conf/global_settings.py:91 +msgid "Korean" +msgstr "韩语" + +#: conf/global_settings.py:92 +msgid "Luxembourgish" +msgstr "" + +#: conf/global_settings.py:93 +msgid "Lithuanian" +msgstr "立陶宛语" + +#: conf/global_settings.py:94 +msgid "Latvian" +msgstr "拉脱维亚语" + +#: conf/global_settings.py:95 +msgid "Macedonian" +msgstr "马其顿语" + +#: conf/global_settings.py:96 +msgid "Malayalam" +msgstr "马来亚拉姆语" + +#: conf/global_settings.py:97 +msgid "Mongolian" +msgstr "蒙古语" + +#: conf/global_settings.py:98 +msgid "Norwegian Bokmal" +msgstr "挪威博克马尔" + +#: conf/global_settings.py:99 +msgid "Nepali" +msgstr "尼泊尔语" + +#: conf/global_settings.py:100 +msgid "Dutch" +msgstr "荷兰语" + +#: conf/global_settings.py:101 +msgid "Norwegian Nynorsk" +msgstr "新挪威语" + +#: conf/global_settings.py:102 +msgid "Punjabi" +msgstr "旁遮普语 " + +#: conf/global_settings.py:103 +msgid "Polish" +msgstr "波兰语" + +#: conf/global_settings.py:104 +msgid "Portuguese" +msgstr "葡萄牙语" + +#: conf/global_settings.py:105 +msgid "Brazilian Portuguese" +msgstr "巴西葡萄牙语" + +#: conf/global_settings.py:106 +msgid "Romanian" +msgstr "罗马尼亚语" + +#: conf/global_settings.py:107 +msgid "Russian" +msgstr "俄语" + +#: conf/global_settings.py:108 +msgid "Slovak" +msgstr "斯洛伐克语" + +#: conf/global_settings.py:109 +msgid "Slovenian" +msgstr "斯洛文尼亚语" + +#: conf/global_settings.py:110 +msgid "Albanian" +msgstr "阿尔巴尼亚语" + +#: conf/global_settings.py:111 +msgid "Serbian" +msgstr "塞尔维亚语" + +#: conf/global_settings.py:112 +msgid "Serbian Latin" +msgstr "塞尔维亚拉丁语" + +#: conf/global_settings.py:113 +msgid "Swedish" +msgstr "瑞典语" + +#: conf/global_settings.py:114 +msgid "Swahili" +msgstr "斯瓦西里语" + +#: conf/global_settings.py:115 +msgid "Tamil" +msgstr "泰米尔语" + +#: conf/global_settings.py:116 +msgid "Telugu" +msgstr "泰卢固语" + +#: conf/global_settings.py:117 +msgid "Thai" +msgstr "泰语" + +#: conf/global_settings.py:118 +msgid "Turkish" +msgstr "土耳其语" + +#: conf/global_settings.py:119 +msgid "Tatar" +msgstr "鞑靼语" + +#: conf/global_settings.py:120 +msgid "Udmurt" +msgstr "" + +#: conf/global_settings.py:121 +msgid "Ukrainian" +msgstr "乌克兰语" + +#: conf/global_settings.py:122 +msgid "Urdu" +msgstr "乌尔都语" + +#: conf/global_settings.py:123 +msgid "Vietnamese" +msgstr "越南语" + +#: conf/global_settings.py:124 +msgid "Simplified Chinese" +msgstr "简体中文" + +#: conf/global_settings.py:125 +msgid "Traditional Chinese" +msgstr "繁体中文" + +#: core/validators.py:21 forms/fields.py:52 +msgid "Enter a valid value." +msgstr "输入一个有效的值。" + +#: core/validators.py:104 forms/fields.py:464 +msgid "Enter a valid email address." +msgstr "" + +#: core/validators.py:107 forms/fields.py:1013 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "输入一个有效的 'slug'，由字母、数字、下划线或横线组成。" + +#: core/validators.py:110 core/validators.py:129 forms/fields.py:987 +msgid "Enter a valid IPv4 address." +msgstr "输入一个有效的 IPv4 地址。" + +#: core/validators.py:115 core/validators.py:130 +msgid "Enter a valid IPv6 address." +msgstr "填写合法的IPv6地址。" + +#: core/validators.py:125 core/validators.py:128 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "输入可用的IPv4 或 IPv6 地址." + +#: core/validators.py:151 db/models/fields/__init__.py:655 +msgid "Enter only digits separated by commas." +msgstr "只能输入用逗号分隔的数字。" + +#: core/validators.py:157 +#, 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:176 forms/fields.py:210 forms/fields.py:263 +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "确保该值小于或等于%(limit_value)s。" + +#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264 +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "确保该值大于或等于%(limit_value)s。" + +#: core/validators.py:189 +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr "确保该值不少于 %(limit_value)d 个字符 (现在有 %(show_value)d 个)。" + +#: core/validators.py:196 +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr "确保该值不多于 %(limit_value)d 个字符 (现在有 %(show_value)d 个)。" + +#: db/models/base.py:857 +#, 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:880 forms/models.py:573 +msgid "and" +msgstr "和" + +#: db/models/base.py:881 db/models/fields/__init__.py:70 +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "具有 %(field_label)s 的 %(model_name)s 已存在。" + +#: db/models/fields/__init__.py:67 +#, python-format +msgid "Value %r is not a valid choice." +msgstr "值 %r 不是有效选项。" + +#: db/models/fields/__init__.py:68 +msgid "This field cannot be null." +msgstr "这个值不能为 null。" + +#: db/models/fields/__init__.py:69 +msgid "This field cannot be blank." +msgstr "此字段不能为空。" + +#: db/models/fields/__init__.py:76 +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "字段类型：%(field_type)s" + +#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985 +msgid "Integer" +msgstr "整数" + +#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983 +#, python-format +msgid "'%s' value must be an integer." +msgstr "'%s' 值必须为一个整数（integer）类型。" + +#: db/models/fields/__init__.py:569 +#, python-format +msgid "'%s' value must be either True or False." +msgstr "'%s' 值必须为 True 或 False." + +#: db/models/fields/__init__.py:571 +msgid "Boolean (Either True or False)" +msgstr "布尔值（真或假）" + +#: db/models/fields/__init__.py:622 +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "字符串（最长 %(max_length)s 位）" + +#: db/models/fields/__init__.py:650 +msgid "Comma-separated integers" +msgstr "逗号分隔的整数" + +#: db/models/fields/__init__.py:664 +#, python-format +msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format." +msgstr "'%s' 值的日期格式无效. 必须为 YYYY-MM-DD 格式." + +#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754 +#, python-format +msgid "" +"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date." +msgstr "'%s' 值的格式 (YYYY-MM-DD)正确， 但日期无效." + +#: db/models/fields/__init__.py:669 +msgid "Date (without time)" +msgstr "日期（无时间）" + +#: db/models/fields/__init__.py:752 +#, python-format +msgid "" +"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "'%s' 值格式无效. 必须为 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 格式." + +#: db/models/fields/__init__.py:756 +#, python-format +msgid "" +"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but " +"it is an invalid date/time." +msgstr "" +"'%s' 值格式正确 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 但是日期/时间无效." + +#: db/models/fields/__init__.py:760 +msgid "Date (with time)" +msgstr "日期（带时间）" + +#: db/models/fields/__init__.py:849 +#, python-format +msgid "'%s' value must be a decimal number." +msgstr "'%s' 值必须为十进制小数." + +#: db/models/fields/__init__.py:851 +msgid "Decimal number" +msgstr "小数" + +#: db/models/fields/__init__.py:908 +msgid "Email address" +msgstr "Email 地址" + +#: db/models/fields/__init__.py:927 +msgid "File path" +msgstr "文件路径" + +#: db/models/fields/__init__.py:954 +#, python-format +msgid "'%s' value must be a float." +msgstr "'%s' 值必须为浮点数." + +#: db/models/fields/__init__.py:956 +msgid "Floating point number" +msgstr "浮点数" + +#: db/models/fields/__init__.py:1017 +msgid "Big (8 byte) integer" +msgstr "大整数(8字节)" + +#: db/models/fields/__init__.py:1031 +msgid "IPv4 address" +msgstr "IPv4 地址" + +#: db/models/fields/__init__.py:1047 +msgid "IP address" +msgstr "IP 地址" + +#: db/models/fields/__init__.py:1090 +#, python-format +msgid "'%s' value must be either None, True or False." +msgstr "'%s' 值必须为 None, True 或者 False." + +#: db/models/fields/__init__.py:1092 +msgid "Boolean (Either True, False or None)" +msgstr "布尔值（真、假或无)" + +#: db/models/fields/__init__.py:1141 +msgid "Positive integer" +msgstr "正整数" + +#: db/models/fields/__init__.py:1152 +msgid "Positive small integer" +msgstr "正小整数" + +#: db/models/fields/__init__.py:1163 +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "Slug (多达 %(max_length)s)" + +#: db/models/fields/__init__.py:1181 +msgid "Small integer" +msgstr "小整数" + +#: db/models/fields/__init__.py:1187 +msgid "Text" +msgstr "文本" + +#: db/models/fields/__init__.py:1205 +#, python-format +msgid "" +"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." +msgstr "'%s' 值格式无效. 必须为HH:MM[:ss[.uuuuuu]] 格式." + +#: db/models/fields/__init__.py:1207 +#, python-format +msgid "" +"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid " +"time." +msgstr "'%s' 值格式正确 (HH:MM[:ss[.uuuuuu]]) 但是时间无效." + +#: db/models/fields/__init__.py:1210 +msgid "Time" +msgstr "时间" + +#: db/models/fields/__init__.py:1272 +msgid "URL" +msgstr "URL" + +#: db/models/fields/files.py:216 +msgid "File" +msgstr "文件" + +#: db/models/fields/files.py:323 +msgid "Image" +msgstr "图像" + +#: db/models/fields/related.py:979 +#, python-format +msgid "Model %(model)s with pk %(pk)r does not exist." +msgstr "模型 %(model)s 的外键 %(pk)r 不存在。" + +#: db/models/fields/related.py:981 +msgid "Foreign Key (type determined by related field)" +msgstr "外键(由相关字段确定)" + +#: db/models/fields/related.py:1111 +msgid "One-to-one relationship" +msgstr "一对一关系" + +#: db/models/fields/related.py:1178 +msgid "Many-to-many relationship" +msgstr "多对多关系" + +#: db/models/fields/related.py:1203 +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "按下 \"Control\"，或者在Mac上按 \"Command\" 来选择多个值。" + +#: forms/fields.py:51 +msgid "This field is required." +msgstr "这个字段是必填项。" + +#: forms/fields.py:209 +msgid "Enter a whole number." +msgstr "输入整数。" + +#: forms/fields.py:241 forms/fields.py:262 +msgid "Enter a number." +msgstr "输入一个数字。" + +#: forms/fields.py:265 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "确认数字全长不超过 %s 位。" + +#: forms/fields.py:266 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "确认小数不超过 %s 位。" + +#: forms/fields.py:267 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "确认小数点前不超过 %s 位。" + +#: forms/fields.py:355 forms/fields.py:953 +msgid "Enter a valid date." +msgstr "输入一个有效的日期。" + +#: forms/fields.py:378 forms/fields.py:954 +msgid "Enter a valid time." +msgstr "输入一个有效的时间。" + +#: forms/fields.py:399 +msgid "Enter a valid date/time." +msgstr "输入一个有效的日期/时间。" + +#: forms/fields.py:475 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "未提交文件。请检查表单的编码类型。" + +#: forms/fields.py:476 +msgid "No file was submitted." +msgstr "没有提交文件。" + +#: forms/fields.py:477 +msgid "The submitted file is empty." +msgstr "所提交的是空文件。" + +#: forms/fields.py:478 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "确保文件名不多于 %(max)d 个字符 (现在有 %(length)d 个)。" + +#: forms/fields.py:479 +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "请提交文件或勾选清除复选框，两者其一即可。" + +#: forms/fields.py:534 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "请上传一张有效的图片。您所上传的文件不是图片或者是已损坏的图片。" + +#: forms/fields.py:580 +msgid "Enter a valid URL." +msgstr "输入一个有效的 URL。" + +#: forms/fields.py:666 forms/fields.py:746 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "选择一个有效的选项。 %(value)s 不在可用的选项中。" + +#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002 +msgid "Enter a list of values." +msgstr "输入一系列值。" + +#: forms/formsets.py:324 forms/formsets.py:326 +msgid "Order" +msgstr "排序" + +#: forms/formsets.py:328 +msgid "Delete" +msgstr "删除" + +#: forms/models.py:567 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "请修改%(field)s的重复数据" + +#: forms/models.py:571 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "请修改%(field)s的重复数据.这个字段必须唯一" + +#: forms/models.py:577 +#, 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 "" +"请修正%(field_name)s的重复数据。%(date_field)s %(lookup)s 在 %(field_name)s " +"必须保证唯一." + +#: forms/models.py:585 +msgid "Please correct the duplicate values below." +msgstr "请修正重复的数据." + +#: forms/models.py:852 +msgid "The inline foreign key did not match the parent instance primary key." +msgstr "内联外键与父实例的主键不匹配。" + +#: forms/models.py:913 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "选择一个有效的选项： 该选择不在可用的选项中。" + +#: forms/models.py:1003 +#, python-format +msgid "Select a valid choice. %s is not one of the available choices." +msgstr "选择一个有效的选项： '%s' 不在可用的选项中。" + +#: forms/models.py:1005 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "\"%s\" 不是" + +#: forms/util.py:81 +#, 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:336 +msgid "Currently" +msgstr "目前" + +#: forms/widgets.py:337 +msgid "Change" +msgstr "修改" + +#: forms/widgets.py:338 +msgid "Clear" +msgstr "清除" + +#: forms/widgets.py:594 +msgid "Unknown" +msgstr "未知" + +#: forms/widgets.py:595 +msgid "Yes" +msgstr "是" + +#: forms/widgets.py:596 +msgid "No" +msgstr "否" + +#: template/defaultfilters.py:794 +msgid "yes,no,maybe" +msgstr "是、否、也许" + +#: template/defaultfilters.py:822 template/defaultfilters.py:833 +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d 字节" + +#: template/defaultfilters.py:835 +#, python-format +msgid "%s KB" +msgstr "%s KB" + +#: template/defaultfilters.py:837 +#, python-format +msgid "%s MB" +msgstr "%s MB" + +#: template/defaultfilters.py:839 +#, python-format +msgid "%s GB" +msgstr "%s GB" + +#: template/defaultfilters.py:841 +#, python-format +msgid "%s TB" +msgstr "%s TB" + +#: template/defaultfilters.py:842 +#, python-format +msgid "%s PB" +msgstr "%s PB" + +#: utils/dateformat.py:47 +msgid "p.m." +msgstr "p.m." + +#: utils/dateformat.py:48 +msgid "a.m." +msgstr "a.m." + +#: utils/dateformat.py:53 +msgid "PM" +msgstr "PM" + +#: utils/dateformat.py:54 +msgid "AM" +msgstr "AM" + +#: 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/text.py:70 +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s..." +msgstr "%(truncated_text)s..." + +#: utils/text.py:239 +msgid "or" +msgstr "或" + +#. Translators: This string is used as a separator between list elements +#: utils/text.py:256 +msgid ", " +msgstr "，" + +#: utils/timesince.py:22 +msgid "year" +msgid_plural "years" +msgstr[0] "年" + +#: utils/timesince.py:23 +msgid "month" +msgid_plural "months" +msgstr[0] "月" + +#: utils/timesince.py:24 +msgid "week" +msgid_plural "weeks" +msgstr[0] "周" + +#: utils/timesince.py:25 +msgid "day" +msgid_plural "days" +msgstr[0] "天" + +#: utils/timesince.py:26 +msgid "hour" +msgid_plural "hours" +msgstr[0] "小时" + +#: utils/timesince.py:27 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "分钟" + +#: utils/timesince.py:43 +msgid "minutes" +msgstr "分钟" + +#: utils/timesince.py:48 +#, python-format +msgid "%(number)d %(type)s" +msgstr "%(number)d %(type)s" + +#: utils/timesince.py:54 +#, python-format +msgid ", %(number)d %(type)s" +msgstr ", %(number)d %(type)s" + +#: 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 "\"%(path)s\" 不存在" + +#: views/static.py:98 +#, python-format +msgid "Index of %(directory)s" +msgstr "%(directory)s的索引" + +#: 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:393 +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr "%(verbose_name_plural)s 不存在" + +#: views/generic/dates.py:646 +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"因为 %(class_name)s.allow_future 设置为 False，所以特性 " +"%(verbose_name_plural)s 不可用。" + +#: views/generic/dates.py:678 +#, python-format +msgid "Invalid date string '%(datestr)s' given format '%(format)s'" +msgstr "日期文字 '%(datestr)s' 不匹配格式 '%(format)s'" + +#: views/generic/detail.py:54 +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "没有找到符合查询的 %(verbose_name)s" + +#: views/generic/list.py:51 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "page 不等于 'last'，或者它不能被转为数字。" + +#: views/generic/list.py:56 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "" + +#: views/generic/list.py:137 +#, python-format +msgid "Empty list and '%(class_name)s.allow_empty' is False." +msgstr "列表是空的并且'%(class_name)s.allow_empty 设置为 False'" diff -Nru python-django-1.6.6/django/conf/locale/zh_Hant/formats.py python-django-1.7.4/django/conf/locale/zh_Hant/formats.py --- python-django-1.6.6/django/conf/locale/zh_Hant/formats.py 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_Hant/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,45 @@ +# -*- 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 = 'Y年n月j日' # 2016年9月5日 +TIME_FORMAT = 'H:i' # 20:45 +DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +YEAR_MONTH_FORMAT = 'Y年n月' # 2016年9月 +MONTH_DAY_FORMAT = 'm月j日' # 9月5日 +SHORT_DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 +SHORT_DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +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', # '2016/09/05' + '%Y-%m-%d', # '2016-09-05' + '%Y年%n月%j日', # '2016年9月5日' +) + +TIME_INPUT_FORMATS = ( + '%H:%M', # '20:45' + '%H:%M:%S', # '20:45:29' + '%H:%M:%S.%f', # '20:45:29.000200' +) + +DATETIME_INPUT_FORMATS = ( + '%Y/%m/%d %H:%M', # '2016/09/05 20:45' + '%Y-%m-%d %H:%M', # '2016-09-05 20:45' + '%Y年%n月%j日 %H:%M', # '2016年9月5日 14:45' + '%Y/%m/%d %H:%M:%S', # '2016/09/05 20:45:29' + '%Y-%m-%d %H:%M:%S', # '2016-09-05 20:45:29' + '%Y年%n月%j日 %H:%M:%S', # '2016年9月5日 20:45:29' + '%Y/%m/%d %H:%M:%S.%f', # '2016/09/05 20:45:29.000200' + '%Y-%m-%d %H:%M:%S.%f', # '2016-09-05 20:45:29.000200' + '%Y年%n月%j日 %H:%n:%S.%f', # '2016年9月5日 20:45:29.000200' +) + +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = '' +NUMBER_GROUPING = 4 Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/zh_Hant/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/zh_Hant/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/zh_Hant/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/zh_Hant/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_Hant/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,1227 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# , 2012. +# Jannis Leidel , 2011. +# ming hsien tzang , 2011. +# tcc , 2011. +# , 2012. +msgid "" +msgstr "" +"Project-Id-Version: Django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2013-01-01 16:10+0100\n" +"PO-Revision-Date: 2013-01-02 08:47+0000\n" +"Last-Translator: yyc1217 \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" +"language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: conf/global_settings.py:48 +msgid "Afrikaans" +msgstr "" + +#: conf/global_settings.py:49 +msgid "Arabic" +msgstr "阿拉伯語" + +#: conf/global_settings.py:50 +msgid "Azerbaijani" +msgstr "阿塞拜疆(Azerbaijani)" + +#: conf/global_settings.py:51 +msgid "Bulgarian" +msgstr "保加利亞語" + +#: conf/global_settings.py:52 +msgid "Belarusian" +msgstr "白俄羅斯人" + +#: conf/global_settings.py:53 +msgid "Bengali" +msgstr "孟加拉語" + +#: conf/global_settings.py:54 +msgid "Breton" +msgstr "" + +#: conf/global_settings.py:55 +msgid "Bosnian" +msgstr "波士尼亞語" + +#: conf/global_settings.py:56 +msgid "Catalan" +msgstr "嘉泰羅尼亞語" + +#: conf/global_settings.py:57 +msgid "Czech" +msgstr "捷克語" + +#: conf/global_settings.py:58 +msgid "Welsh" +msgstr "威爾斯語" + +#: conf/global_settings.py:59 +msgid "Danish" +msgstr "丹麥語" + +#: conf/global_settings.py:60 +msgid "German" +msgstr "德語" + +#: conf/global_settings.py:61 +msgid "Greek" +msgstr "希臘語" + +#: conf/global_settings.py:62 +msgid "English" +msgstr "英語" + +#: conf/global_settings.py:63 +msgid "British English" +msgstr "英國英語" + +#: conf/global_settings.py:64 +msgid "Esperanto" +msgstr "世界語(Esperanto)" + +#: conf/global_settings.py:65 +msgid "Spanish" +msgstr "西班牙語" + +#: conf/global_settings.py:66 +msgid "Argentinian Spanish" +msgstr "阿根廷西班牙語" + +#: conf/global_settings.py:67 +msgid "Mexican Spanish" +msgstr "墨西哥西班牙語(Mexican Spanish)" + +#: conf/global_settings.py:68 +msgid "Nicaraguan Spanish" +msgstr "尼加拉瓜西班牙語(Nicaraguan Spanish)" + +#: conf/global_settings.py:69 +msgid "Venezuelan Spanish" +msgstr "委內瑞拉西班牙人" + +#: conf/global_settings.py:70 +msgid "Estonian" +msgstr "愛沙尼亞語" + +#: conf/global_settings.py:71 +msgid "Basque" +msgstr "巴斯克語" + +#: conf/global_settings.py:72 +msgid "Persian" +msgstr "波斯語" + +#: conf/global_settings.py:73 +msgid "Finnish" +msgstr "芬蘭語" + +#: conf/global_settings.py:74 +msgid "French" +msgstr "法語" + +#: conf/global_settings.py:75 +msgid "Frisian" +msgstr "弗里斯蘭語" + +#: conf/global_settings.py:76 +msgid "Irish" +msgstr "愛爾蘭語" + +#: conf/global_settings.py:77 +msgid "Galician" +msgstr "加里西亞語" + +#: conf/global_settings.py:78 +msgid "Hebrew" +msgstr "希伯來語" + +#: conf/global_settings.py:79 +msgid "Hindi" +msgstr "印度語" + +#: conf/global_settings.py:80 +msgid "Croatian" +msgstr "克羅埃西亞語" + +#: conf/global_settings.py:81 +msgid "Hungarian" +msgstr "匈牙利語" + +#: conf/global_settings.py:82 +msgid "Interlingua" +msgstr "" + +#: conf/global_settings.py:83 +msgid "Indonesian" +msgstr "印尼語" + +#: conf/global_settings.py:84 +msgid "Icelandic" +msgstr "冰島語" + +#: conf/global_settings.py:85 +msgid "Italian" +msgstr "義大利語" + +#: conf/global_settings.py:86 +msgid "Japanese" +msgstr "日語" + +#: conf/global_settings.py:87 +msgid "Georgian" +msgstr "喬治亞語" + +#: conf/global_settings.py:88 +msgid "Kazakh" +msgstr "哈薩克(Kazakh)" + +#: conf/global_settings.py:89 +msgid "Khmer" +msgstr "高棉語" + +#: conf/global_settings.py:90 +msgid "Kannada" +msgstr "坎那達語" + +#: conf/global_settings.py:91 +msgid "Korean" +msgstr "韓語" + +#: conf/global_settings.py:92 +msgid "Luxembourgish" +msgstr "" + +#: conf/global_settings.py:93 +msgid "Lithuanian" +msgstr "立陶宛語" + +#: conf/global_settings.py:94 +msgid "Latvian" +msgstr "拉脫維亞語" + +#: conf/global_settings.py:95 +msgid "Macedonian" +msgstr "馬其頓語" + +#: conf/global_settings.py:96 +msgid "Malayalam" +msgstr "馬來亞拉姆語" + +#: conf/global_settings.py:97 +msgid "Mongolian" +msgstr "蒙古語" + +#: conf/global_settings.py:98 +msgid "Norwegian Bokmal" +msgstr "挪威語（波克默爾）" + +#: conf/global_settings.py:99 +msgid "Nepali" +msgstr "尼泊爾(Nepali)" + +#: conf/global_settings.py:100 +msgid "Dutch" +msgstr "荷蘭語" + +#: conf/global_settings.py:101 +msgid "Norwegian Nynorsk" +msgstr "挪威語（尼諾斯克）" + +#: conf/global_settings.py:102 +msgid "Punjabi" +msgstr "旁遮普語" + +#: conf/global_settings.py:103 +msgid "Polish" +msgstr "波蘭嶼" + +#: conf/global_settings.py:104 +msgid "Portuguese" +msgstr "葡萄牙語" + +#: conf/global_settings.py:105 +msgid "Brazilian Portuguese" +msgstr "巴西葡萄牙語" + +#: conf/global_settings.py:106 +msgid "Romanian" +msgstr "羅馬尼亞語" + +#: conf/global_settings.py:107 +msgid "Russian" +msgstr "俄語" + +#: conf/global_settings.py:108 +msgid "Slovak" +msgstr "斯洛伐克語" + +#: conf/global_settings.py:109 +msgid "Slovenian" +msgstr "斯洛維尼亞語" + +#: conf/global_settings.py:110 +msgid "Albanian" +msgstr "阿爾巴尼亞語" + +#: conf/global_settings.py:111 +msgid "Serbian" +msgstr "塞爾維亞語" + +#: conf/global_settings.py:112 +msgid "Serbian Latin" +msgstr "塞爾維亞拉丁語" + +#: conf/global_settings.py:113 +msgid "Swedish" +msgstr "瑞典語" + +#: conf/global_settings.py:114 +msgid "Swahili" +msgstr "斯瓦希裡(Swahili)" + +#: conf/global_settings.py:115 +msgid "Tamil" +msgstr "坦米爾語" + +#: conf/global_settings.py:116 +msgid "Telugu" +msgstr "泰盧固語" + +#: conf/global_settings.py:117 +msgid "Thai" +msgstr "泰語" + +#: conf/global_settings.py:118 +msgid "Turkish" +msgstr "土耳其語" + +#: conf/global_settings.py:119 +msgid "Tatar" +msgstr "韃靼(Tatar)" + +#: conf/global_settings.py:120 +msgid "Udmurt" +msgstr "" + +#: conf/global_settings.py:121 +msgid "Ukrainian" +msgstr "烏克蘭語" + +#: conf/global_settings.py:122 +msgid "Urdu" +msgstr "烏爾都語(Urdu)" + +#: conf/global_settings.py:123 +msgid "Vietnamese" +msgstr "越南語" + +#: conf/global_settings.py:124 +msgid "Simplified Chinese" +msgstr "簡體中文" + +#: conf/global_settings.py:125 +msgid "Traditional Chinese" +msgstr "繁體中文" + +#: core/validators.py:21 forms/fields.py:52 +msgid "Enter a valid value." +msgstr "輸入有效的值" + +#: core/validators.py:104 forms/fields.py:464 +msgid "Enter a valid email address." +msgstr "輸入有效的電子郵件地址。" + +#: core/validators.py:107 forms/fields.py:1013 +msgid "" +"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." +msgstr "輸入一個有效的 'slug'，由字母、數字、底線與連字號組成。" + +#: core/validators.py:110 core/validators.py:129 forms/fields.py:987 +msgid "Enter a valid IPv4 address." +msgstr "輸入有效的 IPv4 位址。" + +#: core/validators.py:115 core/validators.py:130 +msgid "Enter a valid IPv6 address." +msgstr "請輸入有效的 IPv6 位址。" + +#: core/validators.py:125 core/validators.py:128 +msgid "Enter a valid IPv4 or IPv6 address." +msgstr "請輸入有效的 IPv4 或 IPv6 位址。" + +#: core/validators.py:151 db/models/fields/__init__.py:655 +msgid "Enter only digits separated by commas." +msgstr "輸入以逗號分隔的數字。" + +#: core/validators.py:157 +#, 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:176 forms/fields.py:210 forms/fields.py:263 +#, python-format +msgid "Ensure this value is less than or equal to %(limit_value)s." +msgstr "確認這個數值是否小於或等於 %(limit_value)s。" + +#: core/validators.py:182 forms/fields.py:211 forms/fields.py:264 +#, python-format +msgid "Ensure this value is greater than or equal to %(limit_value)s." +msgstr "確認這個數值是否大於或等於 %(limit_value)s。" + +#: core/validators.py:189 +#, python-format +msgid "" +"Ensure this value has at least %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr "" +"請確認這個內容至少要 %(limit_value)d 個字元 (目前有 %(show_value)d 個字)。" + +#: core/validators.py:196 +#, python-format +msgid "" +"Ensure this value has at most %(limit_value)d characters (it has " +"%(show_value)d)." +msgstr "" +"請確認這個內容最多只能有 %(limit_value)d 個字元 (目前有 %(show_value)d 個" +"字)。" + +#: db/models/base.py:857 +#, 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:880 forms/models.py:573 +msgid "and" +msgstr "和" + +#: db/models/base.py:881 db/models/fields/__init__.py:70 +#, python-format +msgid "%(model_name)s with this %(field_label)s already exists." +msgstr "這個 %(field_label)s 在 %(model_name)s 已經存在。" + +#: db/models/fields/__init__.py:67 +#, python-format +msgid "Value %r is not a valid choice." +msgstr "數值 %r 並非是一個有效的選擇" + +#: db/models/fields/__init__.py:68 +msgid "This field cannot be null." +msgstr "這個值不能是 null。" + +#: db/models/fields/__init__.py:69 +msgid "This field cannot be blank." +msgstr "這個欄位不能留白" + +#: db/models/fields/__init__.py:76 +#, python-format +msgid "Field of type: %(field_type)s" +msgstr "欄位型態： %(field_type)s" + +#: db/models/fields/__init__.py:517 db/models/fields/__init__.py:985 +msgid "Integer" +msgstr "整數" + +#: db/models/fields/__init__.py:521 db/models/fields/__init__.py:983 +#, python-format +msgid "'%s' value must be an integer." +msgstr "'%s' 的值必須為一個整數。" + +#: db/models/fields/__init__.py:569 +#, python-format +msgid "'%s' value must be either True or False." +msgstr "'%s' 的值必須為 True 或 False。" + +#: db/models/fields/__init__.py:571 +msgid "Boolean (Either True or False)" +msgstr "布林值 (True 或 False)" + +#: db/models/fields/__init__.py:622 +#, python-format +msgid "String (up to %(max_length)s)" +msgstr "字串 (最長到 %(max_length)s 個字)" + +#: db/models/fields/__init__.py:650 +msgid "Comma-separated integers" +msgstr "逗號分隔的整數" + +#: db/models/fields/__init__.py:664 +#, python-format +msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format." +msgstr "'%s' 的值為無效的日期格式。其格式必須為 YYYY-MM-DD 形式。" + +#: db/models/fields/__init__.py:666 db/models/fields/__init__.py:754 +#, python-format +msgid "" +"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date." +msgstr "'%s' 的值為有效的格式 (YYYY-MM-DD) 但日期有誤。" + +#: db/models/fields/__init__.py:669 +msgid "Date (without time)" +msgstr "日期 (不包括時間)" + +#: db/models/fields/__init__.py:752 +#, python-format +msgid "" +"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." +"uuuuuu]][TZ] format." +msgstr "" +"'%s' 的值為無效的格式。其格式必須為 YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ] 形式。" + +#: db/models/fields/__init__.py:756 +#, python-format +msgid "" +"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but " +"it is an invalid date/time." +msgstr "" +"'%s' 的值為有效格式 (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) 但日期/時間有誤。" + +#: db/models/fields/__init__.py:760 +msgid "Date (with time)" +msgstr "日期 (包括時間)" + +#: db/models/fields/__init__.py:849 +#, python-format +msgid "'%s' value must be a decimal number." +msgstr "'%s' 的值必須為一個十進位數字。" + +#: db/models/fields/__init__.py:851 +msgid "Decimal number" +msgstr "十進位數(小數可)" + +#: db/models/fields/__init__.py:908 +msgid "Email address" +msgstr "電子郵件地址" + +#: db/models/fields/__init__.py:927 +msgid "File path" +msgstr "檔案路徑" + +#: db/models/fields/__init__.py:954 +#, python-format +msgid "'%s' value must be a float." +msgstr "'%s' 的值必須為浮點數。" + +#: db/models/fields/__init__.py:956 +msgid "Floating point number" +msgstr "浮點數" + +#: db/models/fields/__init__.py:1017 +msgid "Big (8 byte) integer" +msgstr "大整數(8位元組)" + +#: db/models/fields/__init__.py:1031 +msgid "IPv4 address" +msgstr "IPv4 地址" + +#: db/models/fields/__init__.py:1047 +msgid "IP address" +msgstr "IP 位址" + +#: db/models/fields/__init__.py:1090 +#, python-format +msgid "'%s' value must be either None, True or False." +msgstr "'%s' 的值必須為空，True 或是 False。" + +#: db/models/fields/__init__.py:1092 +msgid "Boolean (Either True, False or None)" +msgstr "布林值 (True, False 或 None)" + +#: db/models/fields/__init__.py:1141 +msgid "Positive integer" +msgstr "正整數" + +#: db/models/fields/__init__.py:1152 +msgid "Positive small integer" +msgstr "正小整數" + +#: db/models/fields/__init__.py:1163 +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "可讀網址 (長度最多 %(max_length)s)" + +#: db/models/fields/__init__.py:1181 +msgid "Small integer" +msgstr "小整數" + +#: db/models/fields/__init__.py:1187 +msgid "Text" +msgstr "文字" + +#: db/models/fields/__init__.py:1205 +#, python-format +msgid "" +"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." +msgstr "'%s' 的值為無效的格式。其格式必須為 HH:MM[:ss[.uuuuuu]] 形式。" + +#: db/models/fields/__init__.py:1207 +#, python-format +msgid "" +"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid " +"time." +msgstr "'%s' 的值為有效的格式 (HH:MM[:ss[.uuuuuu]]) 但時間有誤。" + +#: db/models/fields/__init__.py:1210 +msgid "Time" +msgstr "時間" + +#: db/models/fields/__init__.py:1272 +msgid "URL" +msgstr "URL" + +#: db/models/fields/files.py:216 +msgid "File" +msgstr "檔案" + +#: db/models/fields/files.py:323 +msgid "Image" +msgstr "影像" + +#: db/models/fields/related.py:979 +#, python-format +msgid "Model %(model)s with pk %(pk)r does not exist." +msgstr "PK 為 %(pk)r 的 Model %(model)s 不存在。" + +#: db/models/fields/related.py:981 +msgid "Foreign Key (type determined by related field)" +msgstr "外鍵 (型態由關連欄位決定)" + +#: db/models/fields/related.py:1111 +msgid "One-to-one relationship" +msgstr "一對一關連" + +#: db/models/fields/related.py:1178 +msgid "Many-to-many relationship" +msgstr "多對多關連" + +#: db/models/fields/related.py:1203 +msgid "" +"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." +msgstr "按住 \"Control\", 或者在 Mac 上按 \"Command\", 以選取更多值" + +#: forms/fields.py:51 +msgid "This field is required." +msgstr "這個欄位是必須的。" + +#: forms/fields.py:209 +msgid "Enter a whole number." +msgstr "輸入整數" + +#: forms/fields.py:241 forms/fields.py:262 +msgid "Enter a number." +msgstr "輸入一個數字" + +#: forms/fields.py:265 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "確認數字全長不超過 %s 位。" + +#: forms/fields.py:266 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "確認想小數不超過 %s 位。" + +#: forms/fields.py:267 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "確認想小數點前不超過 %s 位。" + +#: forms/fields.py:355 forms/fields.py:953 +msgid "Enter a valid date." +msgstr "輸入有效的日期" + +#: forms/fields.py:378 forms/fields.py:954 +msgid "Enter a valid time." +msgstr "輸入有效的時間" + +#: forms/fields.py:399 +msgid "Enter a valid date/time." +msgstr "輸入有效的日期/時間" + +#: forms/fields.py:475 +msgid "No file was submitted. Check the encoding type on the form." +msgstr "沒有檔案被送出。請檢查表單的編碼類型。" + +#: forms/fields.py:476 +msgid "No file was submitted." +msgstr "沒有檔案送出" + +#: forms/fields.py:477 +msgid "The submitted file is empty." +msgstr "送出的檔案是空的。" + +#: forms/fields.py:478 +#, python-format +msgid "" +"Ensure this filename has at most %(max)d characters (it has %(length)d)." +msgstr "請確認這個檔名最多只能有 %(max)d 個字元 (它現在是 %(length)d 個字)。" + +#: forms/fields.py:479 +msgid "Please either submit a file or check the clear checkbox, not both." +msgstr "請提交一個檔案或確認清除核可項, 不能兩者都做。" + +#: forms/fields.py:534 +msgid "" +"Upload a valid image. The file you uploaded was either not an image or a " +"corrupted image." +msgstr "上傳一個有效的圖檔。你上傳的檔案為非圖片，不然就是損壞的圖檔。" + +#: forms/fields.py:580 +msgid "Enter a valid URL." +msgstr "輸入有效的URL" + +#: forms/fields.py:666 forms/fields.py:746 +#, python-format +msgid "Select a valid choice. %(value)s is not one of the available choices." +msgstr "請選擇有效的項目, %(value)s 不是一個可用的選擇。" + +#: forms/fields.py:747 forms/fields.py:835 forms/models.py:1002 +msgid "Enter a list of values." +msgstr "輸入一個列表的值" + +#: forms/formsets.py:324 forms/formsets.py:326 +msgid "Order" +msgstr "排序" + +#: forms/formsets.py:328 +msgid "Delete" +msgstr "刪除" + +#: forms/models.py:567 +#, python-format +msgid "Please correct the duplicate data for %(field)s." +msgstr "請修正 %(field)s 的重覆資料" + +#: forms/models.py:571 +#, python-format +msgid "Please correct the duplicate data for %(field)s, which must be unique." +msgstr "請修正 %(field)s 的重覆資料, 必須為唯一值" + +#: forms/models.py:577 +#, 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 "" +"請修正 %(field_name)s 重複資料, %(date_field)s 的 %(lookup)s 必須是唯一值。" + +#: forms/models.py:585 +msgid "Please correct the duplicate values below." +msgstr "請修正下方重覆的數值" + +#: forms/models.py:852 +msgid "The inline foreign key did not match the parent instance primary key." +msgstr "內含的外鍵無法連接到對應的上層實體主鍵。" + +#: forms/models.py:913 +msgid "Select a valid choice. That choice is not one of the available choices." +msgstr "選擇有效的選項： 此選擇不在可用的選項中。" + +#: forms/models.py:1003 +#, python-format +msgid "Select a valid choice. %s is not one of the available choices." +msgstr "選擇一個有效的選項： '%s' 不在可用的選項中。" + +#: forms/models.py:1005 +#, python-format +msgid "\"%s\" is not a valid value for a primary key." +msgstr "\"%s\" 不是一個主鍵的有效資料。" + +#: forms/util.py:81 +#, 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:336 +msgid "Currently" +msgstr "目前" + +#: forms/widgets.py:337 +msgid "Change" +msgstr "變更" + +#: forms/widgets.py:338 +msgid "Clear" +msgstr "清除" + +#: forms/widgets.py:594 +msgid "Unknown" +msgstr "未知" + +#: forms/widgets.py:595 +msgid "Yes" +msgstr "是" + +#: forms/widgets.py:596 +msgid "No" +msgstr "否" + +#: template/defaultfilters.py:794 +msgid "yes,no,maybe" +msgstr "是、否、也許" + +#: template/defaultfilters.py:822 template/defaultfilters.py:833 +#, python-format +msgid "%(size)d byte" +msgid_plural "%(size)d bytes" +msgstr[0] "%(size)d 位元組" + +#: template/defaultfilters.py:835 +#, python-format +msgid "%s KB" +msgstr "%s KB" + +#: template/defaultfilters.py:837 +#, python-format +msgid "%s MB" +msgstr "%s MB" + +#: template/defaultfilters.py:839 +#, python-format +msgid "%s GB" +msgstr "%s GB" + +#: template/defaultfilters.py:841 +#, python-format +msgid "%s TB" +msgstr "%s TB" + +#: template/defaultfilters.py:842 +#, python-format +msgid "%s PB" +msgstr "%s PB" + +#: utils/dateformat.py:47 +msgid "p.m." +msgstr "p.m." + +#: utils/dateformat.py:48 +msgid "a.m." +msgstr "a.m." + +#: utils/dateformat.py:53 +msgid "PM" +msgstr "PM" + +#: utils/dateformat.py:54 +msgid "AM" +msgstr "AM" + +#: 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/text.py:70 +#, python-format +msgctxt "String to return when truncating text" +msgid "%(truncated_text)s..." +msgstr "%(truncated_text)s..." + +#: utils/text.py:239 +msgid "or" +msgstr "或" + +#. Translators: This string is used as a separator between list elements +#: utils/text.py:256 +msgid ", " +msgstr ", " + +#: utils/timesince.py:22 +msgid "year" +msgid_plural "years" +msgstr[0] "年" + +#: utils/timesince.py:23 +msgid "month" +msgid_plural "months" +msgstr[0] "月" + +#: utils/timesince.py:24 +msgid "week" +msgid_plural "weeks" +msgstr[0] "週" + +#: utils/timesince.py:25 +msgid "day" +msgid_plural "days" +msgstr[0] "天" + +#: utils/timesince.py:26 +msgid "hour" +msgid_plural "hours" +msgstr[0] "小時" + +#: utils/timesince.py:27 +msgid "minute" +msgid_plural "minutes" +msgstr[0] "分鐘" + +#: utils/timesince.py:43 +msgid "minutes" +msgstr "分鐘" + +#: utils/timesince.py:48 +#, python-format +msgid "%(number)d %(type)s" +msgstr "%(number)d %(type)s" + +#: utils/timesince.py:54 +#, python-format +msgid ", %(number)d %(type)s" +msgstr ", %(number)d %(type)s" + +#: 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 "\"%(path)s\" 路徑不存在" + +#: views/static.py:98 +#, python-format +msgid "Index of %(directory)s" +msgstr "%(directory)s 的索引" + +#: 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:393 +#, python-format +msgid "No %(verbose_name_plural)s available" +msgstr "%(verbose_name_plural)s 無法使用" + +#: views/generic/dates.py:646 +#, python-format +msgid "" +"Future %(verbose_name_plural)s not available because %(class_name)s." +"allow_future is False." +msgstr "" +"未來的 %(verbose_name_plural)s 不可用，因 %(class_name)s.allow_future 為 " +"False." + +#: views/generic/dates.py:678 +#, python-format +msgid "Invalid date string '%(datestr)s' given format '%(format)s'" +msgstr "無效的日期字串 '%(datestr)s' 可接受格式 '%(format)s'" + +#: views/generic/detail.py:54 +#, python-format +msgid "No %(verbose_name)s found matching the query" +msgstr "無 %(verbose_name)s 符合本次搜尋" + +#: views/generic/list.py:51 +msgid "Page is not 'last', nor can it be converted to an int." +msgstr "頁面不是最後一頁，也無法被轉換為整數。" + +#: views/generic/list.py:56 +#, python-format +msgid "Invalid page (%(page_number)s): %(message)s" +msgstr "無效的頁面 (%(page_number)s): %(message)s" + +#: views/generic/list.py:137 +#, python-format +msgid "Empty list and '%(class_name)s.allow_empty' is False." +msgstr "為空list且 '%(class_name)s.allow_empty' 為False." diff -Nru python-django-1.6.6/django/conf/locale/zh_TW/formats.py python-django-1.7.4/django/conf/locale/zh_TW/formats.py --- python-django-1.6.6/django/conf/locale/zh_TW/formats.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_TW/formats.py 2015-01-27 17:12:29.000000000 +0000 @@ -5,20 +5,41 @@ # 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 = +DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 +TIME_FORMAT = 'H:i' # 20:45 +DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +YEAR_MONTH_FORMAT = 'Y年n月' # 2016年9月 +MONTH_DAY_FORMAT = 'm月j日' # 9月5日 +SHORT_DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 +SHORT_DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 +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 = -# DECIMAL_SEPARATOR = -# THOUSAND_SEPARATOR = -# NUMBER_GROUPING = +DATE_INPUT_FORMATS = ( + '%Y/%m/%d', # '2016/09/05' + '%Y-%m-%d', # '2016-09-05' + '%Y年%n月%j日', # '2016年9月5日' +) + +TIME_INPUT_FORMATS = ( + '%H:%M', # '20:45' + '%H:%M:%S', # '20:45:29' + '%H:%M:%S.%f', # '20:45:29.000200' +) + +DATETIME_INPUT_FORMATS = ( + '%Y/%m/%d %H:%M', # '2016/09/05 20:45' + '%Y-%m-%d %H:%M', # '2016-09-05 20:45' + '%Y年%n月%j日 %H:%M', # '2016年9月5日 14:45' + '%Y/%m/%d %H:%M:%S', # '2016/09/05 20:45:29' + '%Y-%m-%d %H:%M:%S', # '2016-09-05 20:45:29' + '%Y年%n月%j日 %H:%M:%S', # '2016年9月5日 20:45:29' + '%Y/%m/%d %H:%M:%S.%f', # '2016/09/05 20:45:29.000200' + '%Y-%m-%d %H:%M:%S.%f', # '2016-09-05 20:45:29.000200' + '%Y年%n月%j日 %H:%n:%S.%f', # '2016年9月5日 20:45:29.000200' +) + +DECIMAL_SEPARATOR = '.' +THOUSAND_SEPARATOR = '' +NUMBER_GROUPING = 4 Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/conf/locale/zh_TW/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/conf/locale/zh_TW/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/conf/locale/zh_TW/LC_MESSAGES/django.po python-django-1.7.4/django/conf/locale/zh_TW/LC_MESSAGES/django.po --- python-django-1.6.6/django/conf/locale/zh_TW/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/locale/zh_TW/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,20 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: -# EricHo , 2013 +# Eric Ho , 2013 # ilay , 2012 # Jannis Leidel , 2011 # mail6543210 , 2013 # ming hsien tzang , 2011 # tcc , 2011 -# yyc1217 , 2013 -# yyc1217 , 2012 +# Yeh-Yung , 2013 +# Yeh-Yung , 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: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" "language/zh_TW/)\n" @@ -33,6 +33,10 @@ msgstr "阿拉伯語" #: conf/global_settings.py:53 +msgid "Asturian" +msgstr "" + +#: conf/global_settings.py:53 msgid "Azerbaijani" msgstr "阿塞拜疆(Azerbaijani)" @@ -85,318 +89,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 "世界語(Esperanto)" -#: 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 "墨西哥西班牙語(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 "愛沙尼亞語" -#: 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 "哈薩克(Kazakh)" -#: 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 "尼泊爾(Nepali)" -#: 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 "斯瓦希裡(Swahili)" -#: 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 "韃靼(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 "烏克蘭語" -#: 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 "" -#: 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 +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,245 +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 "%(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 "這個值不能是 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 "大整數(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] "確認數字全長不超過 %(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] "" -#: 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,62 +702,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 "請選擇有效的項目, %(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,39 +769,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 " @@ -765,29 +815,29 @@ msgstr "" "請修正 %(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 "\"%(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 " @@ -796,15 +846,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 "清除" @@ -820,62 +870,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 "午夜" -#: utils/dateformat.py:105 +#: utils/dateformat.py:151 msgid "noon" msgstr "中午" @@ -1151,111 +1201,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." -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." @@ -1264,7 +1330,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'" @@ -1274,16 +1340,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 "為空list且 '%(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/project_template/project_name/settings.py python-django-1.7.4/django/conf/project_template/project_name/settings.py --- python-django-1.6.6/django/conf/project_template/project_name/settings.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/project_template/project_name/settings.py 2015-01-27 17:12:29.000000000 +0000 @@ -43,6 +43,7 @@ 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) diff -Nru python-django-1.6.6/django/conf/project_template/project_name/urls.py python-django-1.7.4/django/conf/project_template/project_name/urls.py --- python-django-1.6.6/django/conf/project_template/project_name/urls.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/project_template/project_name/urls.py 2015-01-27 17:12:29.000000000 +0000 @@ -1,7 +1,5 @@ from django.conf.urls import patterns, include, url - from django.contrib import admin -admin.autodiscover() urlpatterns = patterns('', # Examples: diff -Nru python-django-1.6.6/django/conf/urls/i18n.py python-django-1.7.4/django/conf/urls/i18n.py --- python-django-1.6.6/django/conf/urls/i18n.py 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/conf/urls/i18n.py 2015-01-27 17:12:29.000000000 +0000 @@ -2,6 +2,7 @@ from django.conf.urls import patterns, url from django.core.urlresolvers import LocaleRegexURLResolver + def i18n_patterns(prefix, *args): """ Adds the language code prefix to every URL pattern within this diff -Nru python-django-1.6.6/django/conf/urls/__init__.py python-django-1.7.4/django/conf/urls/__init__.py --- python-django-1.6.6/django/conf/urls/__init__.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/urls/__init__.py 2015-01-27 17:12:29.000000000 +0000 @@ -1,7 +1,8 @@ +from importlib import import_module + from django.core.urlresolvers import (RegexURLPattern, RegexURLResolver, LocaleRegexURLResolver) from django.core.exceptions import ImproperlyConfigured -from django.utils.importlib import import_module from django.utils import six @@ -12,6 +13,7 @@ handler404 = 'django.views.defaults.page_not_found' handler500 = 'django.views.defaults.server_error' + def include(arg, namespace=None, app_name=None): if isinstance(arg, tuple): # callable returning a namespace hint @@ -38,6 +40,7 @@ return (urlconf_module, app_name, namespace) + def patterns(prefix, *args): pattern_list = [] for t in args: @@ -48,8 +51,9 @@ pattern_list.append(t) return pattern_list + def url(regex, view, kwargs=None, name=None, prefix=''): - if isinstance(view, (list,tuple)): + if isinstance(view, (list, tuple)): # For include(...) processing. urlconf_module, app_name, namespace = view return RegexURLResolver(regex, urlconf_module, kwargs, app_name=app_name, namespace=namespace) @@ -60,4 +64,3 @@ if prefix: view = prefix + '.' + view return RegexURLPattern(regex, view, kwargs, name) - diff -Nru python-django-1.6.6/django/conf/urls/shortcut.py python-django-1.7.4/django/conf/urls/shortcut.py --- python-django-1.6.6/django/conf/urls/shortcut.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/conf/urls/shortcut.py 2015-01-27 17:12:29.000000000 +0000 @@ -1,9 +1,10 @@ import warnings from django.conf.urls import patterns +from django.utils.deprecation import RemovedInDjango18Warning warnings.warn("django.conf.urls.shortcut will be removed in Django 1.8.", - PendingDeprecationWarning) + RemovedInDjango18Warning) urlpatterns = patterns('django.views', (r'^(?P\d+)/(?P.*)/$', 'defaults.shortcut'), diff -Nru python-django-1.6.6/django/conf/urls/static.py python-django-1.7.4/django/conf/urls/static.py --- python-django-1.6.6/django/conf/urls/static.py 2014-08-20 19:57:06.000000000 +0000 +++ python-django-1.7.4/django/conf/urls/static.py 2015-01-27 17:12:29.000000000 +0000 @@ -1,8 +1,10 @@ import re + from django.conf import settings from django.conf.urls import patterns, url from django.core.exceptions import ImproperlyConfigured + def static(prefix, view='django.views.static.serve', **kwargs): """ Helper function to return a URL pattern for serving files in debug mode. diff -Nru python-django-1.6.6/django/contrib/admin/actions.py python-django-1.7.4/django/contrib/admin/actions.py --- python-django-1.6.6/django/contrib/admin/actions.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/actions.py 2015-01-27 17:12:29.000000000 +0000 @@ -5,12 +5,13 @@ from django.core.exceptions import PermissionDenied from django.contrib import messages from django.contrib.admin import helpers -from django.contrib.admin.util import get_deleted_objects, model_ngettext +from django.contrib.admin.utils import get_deleted_objects, model_ngettext from django.db import router from django.template.response import TemplateResponse from django.utils.encoding import force_text from django.utils.translation import ugettext_lazy, ugettext as _ + def delete_selected(modeladmin, request, queryset): """ Default action which deletes the selected objects. @@ -62,17 +63,17 @@ else: title = _("Are you sure?") - context = { - "title": title, - "objects_name": objects_name, - "deletable_objects": [deletable_objects], - 'queryset': queryset, - "perms_lacking": perms_needed, - "protected": protected, - "opts": opts, - "app_label": app_label, - 'action_checkbox_name': helpers.ACTION_CHECKBOX_NAME, - } + context = dict( + modeladmin.admin_site.each_context(), + title=title, + objects_name=objects_name, + deletable_objects=[deletable_objects], + queryset=queryset, + perms_lacking=perms_needed, + protected=protected, + opts=opts, + action_checkbox_name=helpers.ACTION_CHECKBOX_NAME, + ) # Display the confirmation page return TemplateResponse(request, modeladmin.delete_selected_confirmation_template or [ diff -Nru python-django-1.6.6/django/contrib/admin/apps.py python-django-1.7.4/django/contrib/admin/apps.py --- python-django-1.6.6/django/contrib/admin/apps.py 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/apps.py 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,22 @@ +from django.apps import AppConfig +from django.core import checks +from django.contrib.admin.checks import check_admin_app +from django.utils.translation import ugettext_lazy as _ + + +class SimpleAdminConfig(AppConfig): + """Simple AppConfig which does not do automatic discovery.""" + + name = 'django.contrib.admin' + verbose_name = _("Administration") + + def ready(self): + checks.register(checks.Tags.admin)(check_admin_app) + + +class AdminConfig(SimpleAdminConfig): + """The default AppConfig for admin which does autodiscovery.""" + + def ready(self): + super(AdminConfig, self).ready() + self.module.autodiscover() diff -Nru python-django-1.6.6/django/contrib/admin/bin/compress.py python-django-1.7.4/django/contrib/admin/bin/compress.py --- python-django-1.6.6/django/contrib/admin/bin/compress.py 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/bin/compress.py 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -#!/usr/bin/env python -import os -import optparse -import subprocess -import sys - -js_path = os.path.join(os.path.dirname(os.path.dirname(__file__)), 'static', 'admin', 'js') - -def main(): - usage = "usage: %prog [file1..fileN]" - description = """With no file paths given this script will automatically -compress all jQuery-based files of the admin app. Requires the Google Closure -Compiler library and Java version 6 or later.""" - parser = optparse.OptionParser(usage, description=description) - parser.add_option("-c", dest="compiler", default="~/bin/compiler.jar", - help="path to Closure Compiler jar file") - parser.add_option("-v", "--verbose", - action="store_true", dest="verbose") - parser.add_option("-q", "--quiet", - action="store_false", dest="verbose") - (options, args) = parser.parse_args() - - compiler = os.path.expanduser(options.compiler) - if not os.path.exists(compiler): - sys.exit("Google Closure compiler jar file %s not found. Please use the -c option to specify the path." % compiler) - - if not args: - if options.verbose: - sys.stdout.write("No filenames given; defaulting to admin scripts\n") - args = [os.path.join(js_path, f) for f in [ - "actions.js", "collapse.js", "inlines.js", "prepopulate.js"]] - - for arg in args: - if not arg.endswith(".js"): - arg = arg + ".js" - to_compress = os.path.expanduser(arg) - if os.path.exists(to_compress): - to_compress_min = "%s.min.js" % "".join(arg.rsplit(".js")) - cmd = "java -jar %s --js %s --js_output_file %s" % (compiler, to_compress, to_compress_min) - if options.verbose: - sys.stdout.write("Running: %s\n" % cmd) - subprocess.call(cmd.split()) - else: - sys.stdout.write("File %s not found. Sure it exists?\n" % to_compress) - -if __name__ == '__main__': - main() diff -Nru python-django-1.6.6/django/contrib/admin/checks.py python-django-1.7.4/django/contrib/admin/checks.py --- python-django-1.6.6/django/contrib/admin/checks.py 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/checks.py 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,965 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from itertools import chain + +from django.contrib.admin.utils import get_fields_from_path, NotRelationField, flatten +from django.core import checks +from django.db import models +from django.db.models.fields import FieldDoesNotExist +from django.forms.models import BaseModelForm, _get_foreign_key, BaseModelFormSet + + +def check_admin_app(**kwargs): + from django.contrib.admin.sites import system_check_errors + + return system_check_errors + + +class BaseModelAdminChecks(object): + + def check(self, cls, model, **kwargs): + errors = [] + errors.extend(self._check_raw_id_fields(cls, model)) + errors.extend(self._check_fields(cls, model)) + errors.extend(self._check_fieldsets(cls, model)) + errors.extend(self._check_exclude(cls, model)) + errors.extend(self._check_form(cls, model)) + errors.extend(self._check_filter_vertical(cls, model)) + errors.extend(self._check_filter_horizontal(cls, model)) + errors.extend(self._check_radio_fields(cls, model)) + errors.extend(self._check_prepopulated_fields(cls, model)) + errors.extend(self._check_view_on_site_url(cls, model)) + errors.extend(self._check_ordering(cls, model)) + errors.extend(self._check_readonly_fields(cls, model)) + return errors + + def _check_raw_id_fields(self, cls, model): + """ Check that `raw_id_fields` only contains field names that are listed + on the model. """ + + if not isinstance(cls.raw_id_fields, (list, tuple)): + return must_be('a list or tuple', option='raw_id_fields', obj=cls, id='admin.E001') + else: + return list(chain(*[ + self._check_raw_id_fields_item(cls, model, field_name, 'raw_id_fields[%d]' % index) + for index, field_name in enumerate(cls.raw_id_fields) + ])) + + def _check_raw_id_fields_item(self, cls, model, field_name, label): + """ Check an item of `raw_id_fields`, i.e. check that field named + `field_name` exists in model `model` and is a ForeignKey or a + ManyToManyField. """ + + try: + field = model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E002') + else: + if not isinstance(field, (models.ForeignKey, models.ManyToManyField)): + return must_be('a ForeignKey or ManyToManyField', + option=label, obj=cls, id='admin.E003') + else: + return [] + + def _check_fields(self, cls, model): + """ Check that `fields` only refer to existing fields, doesn't contain + duplicates. Check if at most one of `fields` and `fieldsets` is defined. + """ + + if cls.fields is None: + return [] + elif not isinstance(cls.fields, (list, tuple)): + return must_be('a list or tuple', option='fields', obj=cls, id='admin.E004') + elif cls.fieldsets: + return [ + checks.Error( + "Both 'fieldsets' and 'fields' are specified.", + hint=None, + obj=cls, + id='admin.E005', + ) + ] + fields = flatten(cls.fields) + if len(fields) != len(set(fields)): + return [ + checks.Error( + "The value of 'fields' contains duplicate field(s).", + hint=None, + obj=cls, + id='admin.E006', + ) + ] + + return list(chain(*[ + self._check_field_spec(cls, model, field_name, 'fields') + for field_name in cls.fields + ])) + + def _check_fieldsets(self, cls, model): + """ Check that fieldsets is properly formatted and doesn't contain + duplicates. """ + + if cls.fieldsets is None: + return [] + elif not isinstance(cls.fieldsets, (list, tuple)): + return must_be('a list or tuple', option='fieldsets', obj=cls, id='admin.E007') + else: + return list(chain(*[ + self._check_fieldsets_item(cls, model, fieldset, 'fieldsets[%d]' % index) + for index, fieldset in enumerate(cls.fieldsets) + ])) + + def _check_fieldsets_item(self, cls, model, fieldset, label): + """ Check an item of `fieldsets`, i.e. check that this is a pair of a + set name and a dictionary containing "fields" key. """ + + if not isinstance(fieldset, (list, tuple)): + return must_be('a list or tuple', option=label, obj=cls, id='admin.E008') + elif len(fieldset) != 2: + return must_be('of length 2', option=label, obj=cls, id='admin.E009') + elif not isinstance(fieldset[1], dict): + return must_be('a dictionary', option='%s[1]' % label, obj=cls, id='admin.E010') + elif 'fields' not in fieldset[1]: + return [ + checks.Error( + "The value of '%s[1]' must contain the key 'fields'." % label, + hint=None, + obj=cls, + id='admin.E011', + ) + ] + + fields = flatten(fieldset[1]['fields']) + if len(fields) != len(set(fields)): + return [ + checks.Error( + "There are duplicate field(s) in '%s[1]'." % label, + hint=None, + obj=cls, + id='admin.E012', + ) + ] + return list(chain(*[ + self._check_field_spec(cls, model, fieldset_fields, '%s[1]["fields"]' % label) + for fieldset_fields in fieldset[1]['fields'] + ])) + + def _check_field_spec(self, cls, model, fields, label): + """ `fields` should be an item of `fields` or an item of + fieldset[1]['fields'] for any `fieldset` in `fieldsets`. It should be a + field name or a tuple of field names. """ + + if isinstance(fields, tuple): + return list(chain(*[ + self._check_field_spec_item(cls, model, field_name, "%s[%d]" % (label, index)) + for index, field_name in enumerate(fields) + ])) + else: + return self._check_field_spec_item(cls, model, fields, label) + + def _check_field_spec_item(self, cls, model, field_name, label): + if field_name in cls.readonly_fields: + # Stuff can be put in fields that isn't actually a model field if + # it's in readonly_fields, readonly_fields will handle the + # validation of such things. + return [] + else: + try: + field = model._meta.get_field(field_name) + except models.FieldDoesNotExist: + # If we can't find a field on the model that matches, it could + # be an extra field on the form. + return [] + else: + if (isinstance(field, models.ManyToManyField) and + not field.rel.through._meta.auto_created): + return [ + checks.Error( + ("The value of '%s' cannot include the ManyToManyField '%s', " + "because that field manually specifies a relationship model.") + % (label, field_name), + hint=None, + obj=cls, + id='admin.E013', + ) + ] + else: + return [] + + def _check_exclude(self, cls, model): + """ Check that exclude is a sequence without duplicates. """ + + if cls.exclude is None: # default value is None + return [] + elif not isinstance(cls.exclude, (list, tuple)): + return must_be('a list or tuple', option='exclude', obj=cls, id='admin.E014') + elif len(cls.exclude) > len(set(cls.exclude)): + return [ + checks.Error( + "The value of 'exclude' contains duplicate field(s).", + hint=None, + obj=cls, + id='admin.E015', + ) + ] + else: + return [] + + def _check_form(self, cls, model): + """ Check that form subclasses BaseModelForm. """ + + if hasattr(cls, 'form') and not issubclass(cls.form, BaseModelForm): + return must_inherit_from(parent='BaseModelForm', option='form', + obj=cls, id='admin.E016') + else: + return [] + + def _check_filter_vertical(self, cls, model): + """ Check that filter_vertical is a sequence of field names. """ + + if not hasattr(cls, 'filter_vertical'): + return [] + elif not isinstance(cls.filter_vertical, (list, tuple)): + return must_be('a list or tuple', option='filter_vertical', obj=cls, id='admin.E017') + else: + return list(chain(*[ + self._check_filter_item(cls, model, field_name, "filter_vertical[%d]" % index) + for index, field_name in enumerate(cls.filter_vertical) + ])) + + def _check_filter_horizontal(self, cls, model): + """ Check that filter_horizontal is a sequence of field names. """ + + if not hasattr(cls, 'filter_horizontal'): + return [] + elif not isinstance(cls.filter_horizontal, (list, tuple)): + return must_be('a list or tuple', option='filter_horizontal', obj=cls, id='admin.E018') + else: + return list(chain(*[ + self._check_filter_item(cls, model, field_name, "filter_horizontal[%d]" % index) + for index, field_name in enumerate(cls.filter_horizontal) + ])) + + def _check_filter_item(self, cls, model, field_name, label): + """ Check one item of `filter_vertical` or `filter_horizontal`, i.e. + check that given field exists and is a ManyToManyField. """ + + try: + field = model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E019') + else: + if not isinstance(field, models.ManyToManyField): + return must_be('a ManyToManyField', option=label, obj=cls, id='admin.E020') + else: + return [] + + def _check_radio_fields(self, cls, model): + """ Check that `radio_fields` is a dictionary. """ + + if not hasattr(cls, 'radio_fields'): + return [] + elif not isinstance(cls.radio_fields, dict): + return must_be('a dictionary', option='radio_fields', obj=cls, id='admin.E021') + else: + return list(chain(*[ + self._check_radio_fields_key(cls, model, field_name, 'radio_fields') + + self._check_radio_fields_value(cls, model, val, 'radio_fields["%s"]' % field_name) + for field_name, val in cls.radio_fields.items() + ])) + + def _check_radio_fields_key(self, cls, model, field_name, label): + """ Check that a key of `radio_fields` dictionary is name of existing + field and that the field is a ForeignKey or has `choices` defined. """ + + try: + field = model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E022') + else: + if not (isinstance(field, models.ForeignKey) or field.choices): + return [ + checks.Error( + "The value of '%s' refers to '%s', which is not an instance of ForeignKey, and does not have a 'choices' definition." % ( + label, field_name + ), + hint=None, + obj=cls, + id='admin.E023', + ) + ] + else: + return [] + + def _check_radio_fields_value(self, cls, model, val, label): + """ Check type of a value of `radio_fields` dictionary. """ + + from django.contrib.admin.options import HORIZONTAL, VERTICAL + + if val not in (HORIZONTAL, VERTICAL): + return [ + checks.Error( + "The value of '%s' must be either admin.HORIZONTAL or admin.VERTICAL." % label, + hint=None, + obj=cls, + id='admin.E024', + ) + ] + else: + return [] + + def _check_view_on_site_url(self, cls, model): + if hasattr(cls, 'view_on_site'): + if not callable(cls.view_on_site) and not isinstance(cls.view_on_site, bool): + return [ + checks.Error( + "The value of 'view_on_site' must be a callable or a boolean value.", + hint=None, + obj=cls, + id='admin.E025', + ) + ] + else: + return [] + else: + return [] + + def _check_prepopulated_fields(self, cls, model): + """ Check that `prepopulated_fields` is a dictionary containing allowed + field types. """ + + if not hasattr(cls, 'prepopulated_fields'): + return [] + elif not isinstance(cls.prepopulated_fields, dict): + return must_be('a dictionary', option='prepopulated_fields', obj=cls, id='admin.E026') + else: + return list(chain(*[ + self._check_prepopulated_fields_key(cls, model, field_name, 'prepopulated_fields') + + self._check_prepopulated_fields_value(cls, model, val, 'prepopulated_fields["%s"]' % field_name) + for field_name, val in cls.prepopulated_fields.items() + ])) + + def _check_prepopulated_fields_key(self, cls, model, field_name, label): + """ Check a key of `prepopulated_fields` dictionary, i.e. check that it + is a name of existing field and the field is one of the allowed types. + """ + + forbidden_field_types = ( + models.DateTimeField, + models.ForeignKey, + models.ManyToManyField + ) + + try: + field = model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E027') + else: + if isinstance(field, forbidden_field_types): + return [ + checks.Error( + "The value of '%s' refers to '%s', which must not be a DateTimeField, " + "ForeignKey or ManyToManyField." % ( + label, field_name + ), + hint=None, + obj=cls, + id='admin.E028', + ) + ] + else: + return [] + + def _check_prepopulated_fields_value(self, cls, model, val, label): + """ Check a value of `prepopulated_fields` dictionary, i.e. it's an + iterable of existing fields. """ + + if not isinstance(val, (list, tuple)): + return must_be('a list or tuple', option=label, obj=cls, id='admin.E029') + else: + return list(chain(*[ + self._check_prepopulated_fields_value_item(cls, model, subfield_name, "%s[%r]" % (label, index)) + for index, subfield_name in enumerate(val) + ])) + + def _check_prepopulated_fields_value_item(self, cls, model, field_name, label): + """ For `prepopulated_fields` equal to {"slug": ("title",)}, + `field_name` is "title". """ + + try: + model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E030') + else: + return [] + + def _check_ordering(self, cls, model): + """ Check that ordering refers to existing fields or is random. """ + + # ordering = None + if cls.ordering is None: # The default value is None + return [] + elif not isinstance(cls.ordering, (list, tuple)): + return must_be('a list or tuple', option='ordering', obj=cls, id='admin.E031') + else: + return list(chain(*[ + self._check_ordering_item(cls, model, field_name, 'ordering[%d]' % index) + for index, field_name in enumerate(cls.ordering) + ])) + + def _check_ordering_item(self, cls, model, field_name, label): + """ Check that `ordering` refers to existing fields. """ + + if field_name == '?' and len(cls.ordering) != 1: + return [ + checks.Error( + ("The value of 'ordering' has the random ordering marker '?', " + "but contains other fields as well."), + hint='Either remove the "?", or remove the other fields.', + obj=cls, + id='admin.E032', + ) + ] + elif field_name == '?': + return [] + elif '__' in field_name: + # Skip ordering in the format field1__field2 (FIXME: checking + # this format would be nice, but it's a little fiddly). + return [] + else: + if field_name.startswith('-'): + field_name = field_name[1:] + + try: + model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E033') + else: + return [] + + def _check_readonly_fields(self, cls, model): + """ Check that readonly_fields refers to proper attribute or field. """ + + if cls.readonly_fields == (): + return [] + elif not isinstance(cls.readonly_fields, (list, tuple)): + return must_be('a list or tuple', option='readonly_fields', obj=cls, id='admin.E034') + else: + return list(chain(*[ + self._check_readonly_fields_item(cls, model, field_name, "readonly_fields[%d]" % index) + for index, field_name in enumerate(cls.readonly_fields) + ])) + + def _check_readonly_fields_item(self, cls, model, field_name, label): + if callable(field_name): + return [] + elif hasattr(cls, field_name): + return [] + elif hasattr(model, field_name): + return [] + else: + try: + model._meta.get_field(field_name) + except models.FieldDoesNotExist: + return [ + checks.Error( + "The value of '%s' is not a callable, an attribute of '%s', or an attribute of '%s.%s'." % ( + label, cls.__name__, model._meta.app_label, model._meta.object_name + ), + hint=None, + obj=cls, + id='admin.E035', + ) + ] + else: + return [] + + +class ModelAdminChecks(BaseModelAdminChecks): + + def check(self, cls, model, **kwargs): + errors = super(ModelAdminChecks, self).check(cls, model=model, **kwargs) + errors.extend(self._check_save_as(cls, model)) + errors.extend(self._check_save_on_top(cls, model)) + errors.extend(self._check_inlines(cls, model)) + errors.extend(self._check_list_display(cls, model)) + errors.extend(self._check_list_display_links(cls, model)) + errors.extend(self._check_list_filter(cls, model)) + errors.extend(self._check_list_select_related(cls, model)) + errors.extend(self._check_list_per_page(cls, model)) + errors.extend(self._check_list_max_show_all(cls, model)) + errors.extend(self._check_list_editable(cls, model)) + errors.extend(self._check_search_fields(cls, model)) + errors.extend(self._check_date_hierarchy(cls, model)) + return errors + + def _check_save_as(self, cls, model): + """ Check save_as is a boolean. """ + + if not isinstance(cls.save_as, bool): + return must_be('a boolean', option='save_as', + obj=cls, id='admin.E101') + else: + return [] + + def _check_save_on_top(self, cls, model): + """ Check save_on_top is a boolean. """ + + if not isinstance(cls.save_on_top, bool): + return must_be('a boolean', option='save_on_top', + obj=cls, id='admin.E102') + else: + return [] + + def _check_inlines(self, cls, model): + """ Check all inline model admin classes. """ + + if not isinstance(cls.inlines, (list, tuple)): + return must_be('a list or tuple', option='inlines', obj=cls, id='admin.E103') + else: + return list(chain(*[ + self._check_inlines_item(cls, model, item, "inlines[%d]" % index) + for index, item in enumerate(cls.inlines) + ])) + + def _check_inlines_item(self, cls, model, inline, label): + """ Check one inline model admin. """ + inline_label = '.'.join([inline.__module__, inline.__name__]) + + from django.contrib.admin.options import BaseModelAdmin + + if not issubclass(inline, BaseModelAdmin): + return [ + checks.Error( + "'%s' must inherit from 'BaseModelAdmin'." % inline_label, + hint=None, + obj=cls, + id='admin.E104', + ) + ] + elif not inline.model: + return [ + checks.Error( + "'%s' must have a 'model' attribute." % inline_label, + hint=None, + obj=cls, + id='admin.E105', + ) + ] + elif not issubclass(inline.model, models.Model): + return must_be('a Model', option='%s.model' % inline_label, + obj=cls, id='admin.E106') + else: + return inline.check(model) + + def _check_list_display(self, cls, model): + """ Check that list_display only contains fields or usable attributes. + """ + + if not isinstance(cls.list_display, (list, tuple)): + return must_be('a list or tuple', option='list_display', obj=cls, id='admin.E107') + else: + return list(chain(*[ + self._check_list_display_item(cls, model, item, "list_display[%d]" % index) + for index, item in enumerate(cls.list_display) + ])) + + def _check_list_display_item(self, cls, model, item, label): + if callable(item): + return [] + elif hasattr(cls, item): + return [] + elif hasattr(model, item): + # getattr(model, item) could be an X_RelatedObjectsDescriptor + try: + field = model._meta.get_field(item) + except models.FieldDoesNotExist: + try: + field = getattr(model, item) + except AttributeError: + field = None + + if field is None: + return [ + checks.Error( + "The value of '%s' refers to '%s', which is not a callable, an attribute of '%s', or an attribute or method on '%s.%s'." % ( + label, item, cls.__name__, model._meta.app_label, model._meta.object_name + ), + hint=None, + obj=cls, + id='admin.E108', + ) + ] + elif isinstance(field, models.ManyToManyField): + return [ + checks.Error( + "The value of '%s' must not be a ManyToManyField." % label, + hint=None, + obj=cls, + id='admin.E109', + ) + ] + else: + return [] + else: + try: + model._meta.get_field(item) + except models.FieldDoesNotExist: + return [ + # This is a deliberate repeat of E108; there's more than one path + # required to test this condition. + checks.Error( + "The value of '%s' refers to '%s', which is not a callable, an attribute of '%s', or an attribute or method on '%s.%s'." % ( + label, item, cls.__name__, model._meta.app_label, model._meta.object_name + ), + hint=None, + obj=cls, + id='admin.E108', + ) + ] + else: + return [] + + def _check_list_display_links(self, cls, model): + """ Check that list_display_links is a unique subset of list_display. + """ + + if cls.list_display_links is None: + return [] + elif not isinstance(cls.list_display_links, (list, tuple)): + return must_be('a list, a tuple, or None', option='list_display_links', obj=cls, id='admin.E110') + else: + return list(chain(*[ + self._check_list_display_links_item(cls, model, field_name, "list_display_links[%d]" % index) + for index, field_name in enumerate(cls.list_display_links) + ])) + + def _check_list_display_links_item(self, cls, model, field_name, label): + if field_name not in cls.list_display: + return [ + checks.Error( + "The value of '%s' refers to '%s', which is not defined in 'list_display'." % ( + label, field_name + ), + hint=None, + obj=cls, + id='admin.E111', + ) + ] + else: + return [] + + def _check_list_filter(self, cls, model): + if not isinstance(cls.list_filter, (list, tuple)): + return must_be('a list or tuple', option='list_filter', obj=cls, id='admin.E112') + else: + return list(chain(*[ + self._check_list_filter_item(cls, model, item, "list_filter[%d]" % index) + for index, item in enumerate(cls.list_filter) + ])) + + def _check_list_filter_item(self, cls, model, item, label): + """ + Check one item of `list_filter`, i.e. check if it is one of three options: + 1. 'field' -- a basic field filter, possibly w/ relationships (e.g. + 'field__rel') + 2. ('field', SomeFieldListFilter) - a field-based list filter class + 3. SomeListFilter - a non-field list filter class + """ + + from django.contrib.admin import ListFilter, FieldListFilter + + if callable(item) and not isinstance(item, models.Field): + # If item is option 3, it should be a ListFilter... + if not issubclass(item, ListFilter): + return must_inherit_from(parent='ListFilter', option=label, + obj=cls, id='admin.E113') + # ... but not a FieldListFilter. + elif issubclass(item, FieldListFilter): + return [ + checks.Error( + "The value of '%s' must not inherit from 'FieldListFilter'." % label, + hint=None, + obj=cls, + id='admin.E114', + ) + ] + else: + return [] + elif isinstance(item, (tuple, list)): + # item is option #2 + field, list_filter_class = item + if not issubclass(list_filter_class, FieldListFilter): + return must_inherit_from(parent='FieldListFilter', option='%s[1]' % label, + obj=cls, id='admin.E115') + else: + return [] + else: + # item is option #1 + field = item + + # Validate the field string + try: + get_fields_from_path(model, field) + except (NotRelationField, FieldDoesNotExist): + return [ + checks.Error( + "The value of '%s' refers to '%s', which does not refer to a Field." % (label, field), + hint=None, + obj=cls, + id='admin.E116', + ) + ] + else: + return [] + + def _check_list_select_related(self, cls, model): + """ Check that list_select_related is a boolean, a list or a tuple. """ + + if not isinstance(cls.list_select_related, (bool, list, tuple)): + return must_be('a boolean, tuple or list', option='list_select_related', + obj=cls, id='admin.E117') + else: + return [] + + def _check_list_per_page(self, cls, model): + """ Check that list_per_page is an integer. """ + + if not isinstance(cls.list_per_page, int): + return must_be('an integer', option='list_per_page', obj=cls, id='admin.E118') + else: + return [] + + def _check_list_max_show_all(self, cls, model): + """ Check that list_max_show_all is an integer. """ + + if not isinstance(cls.list_max_show_all, int): + return must_be('an integer', option='list_max_show_all', obj=cls, id='admin.E119') + else: + return [] + + def _check_list_editable(self, cls, model): + """ Check that list_editable is a sequence of editable fields from + list_display without first element. """ + + if not isinstance(cls.list_editable, (list, tuple)): + return must_be('a list or tuple', option='list_editable', obj=cls, id='admin.E120') + else: + return list(chain(*[ + self._check_list_editable_item(cls, model, item, "list_editable[%d]" % index) + for index, item in enumerate(cls.list_editable) + ])) + + def _check_list_editable_item(self, cls, model, field_name, label): + try: + field = model._meta.get_field_by_name(field_name)[0] + except models.FieldDoesNotExist: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E121') + else: + if field_name not in cls.list_display: + return refer_to_missing_field(field=field_name, option=label, + model=model, obj=cls, id='admin.E122') + + checks.Error( + "The value of '%s' refers to '%s', which is not contained in 'list_display'." % ( + label, field_name + ), + hint=None, + obj=cls, + id='admin.E122', + ), + elif cls.list_display_links and field_name in cls.list_display_links: + return [ + checks.Error( + "The value of '%s' cannot be in both 'list_editable' and 'list_display_links'." % field_name, + hint=None, + obj=cls, + id='admin.E123', + ) + ] + # Check that list_display_links is set, and that the first values of list_editable and list_display are + # not the same. See ticket #22792 for the use case relating to this. + elif (cls.list_display[0] in cls.list_editable and cls.list_display[0] != cls.list_editable[0] and + cls.list_display_links is not None): + return [ + checks.Error( + "The value of '%s' refers to the first field in 'list_display' ('%s'), " + "which cannot be used unless 'list_display_links' is set." % ( + label, cls.list_display[0] + ), + hint=None, + obj=cls, + id='admin.E124', + ) + ] + elif not field.editable: + return [ + checks.Error( + "The value of '%s' refers to '%s', which is not editable through the admin." % ( + label, field_name + ), + hint=None, + obj=cls, + id='admin.E125', + ) + ] + else: + return [] + + def _check_search_fields(self, cls, model): + """ Check search_fields is a sequence. """ + + if not isinstance(cls.search_fields, (list, tuple)): + return must_be('a list or tuple', option='search_fields', obj=cls, id='admin.E126') + else: + return [] + + def _check_date_hierarchy(self, cls, model): + """ Check that date_hierarchy refers to DateField or DateTimeField. """ + + if cls.date_hierarchy is None: + return [] + else: + try: + field = model._meta.get_field(cls.date_hierarchy) + except models.FieldDoesNotExist: + return refer_to_missing_field(option='date_hierarchy', + field=cls.date_hierarchy, + model=model, obj=cls, id='admin.E127') + else: + if not isinstance(field, (models.DateField, models.DateTimeField)): + return must_be('a DateField or DateTimeField', option='date_hierarchy', + obj=cls, id='admin.E128') + else: + return [] + + +class InlineModelAdminChecks(BaseModelAdminChecks): + + def check(self, cls, parent_model, **kwargs): + errors = super(InlineModelAdminChecks, self).check(cls, model=cls.model, **kwargs) + errors.extend(self._check_relation(cls, parent_model)) + errors.extend(self._check_exclude_of_parent_model(cls, parent_model)) + errors.extend(self._check_extra(cls)) + errors.extend(self._check_max_num(cls)) + errors.extend(self._check_min_num(cls)) + errors.extend(self._check_formset(cls)) + return errors + + def _check_exclude_of_parent_model(self, cls, parent_model): + # Do not perform more specific checks if the base checks result in an + # error. + errors = super(InlineModelAdminChecks, self)._check_exclude(cls, parent_model) + if errors: + return [] + + # Skip if `fk_name` is invalid. + if self._check_relation(cls, parent_model): + return [] + + if cls.exclude is None: + return [] + + fk = _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name) + if fk.name in cls.exclude: + return [ + checks.Error( + "Cannot exclude the field '%s', because it is the foreign key " + "to the parent model '%s.%s'." % ( + fk.name, parent_model._meta.app_label, parent_model._meta.object_name + ), + hint=None, + obj=cls, + id='admin.E201', + ) + ] + else: + return [] + + def _check_relation(self, cls, parent_model): + try: + _get_foreign_key(parent_model, cls.model, fk_name=cls.fk_name) + except ValueError as e: + return [checks.Error(e.args[0], hint=None, obj=cls, id='admin.E202')] + else: + return [] + + def _check_extra(self, cls): + """ Check that extra is an integer. """ + + if not isinstance(cls.extra, int): + return must_be('an integer', option='extra', obj=cls, id='admin.E203') + else: + return [] + + def _check_max_num(self, cls): + """ Check that max_num is an integer. """ + + if cls.max_num is None: + return [] + elif not isinstance(cls.max_num, int): + return must_be('an integer', option='max_num', obj=cls, id='admin.E204') + else: + return [] + + def _check_min_num(self, cls): + """ Check that min_num is an integer. """ + + if cls.min_num is None: + return [] + elif not isinstance(cls.min_num, int): + return must_be('an integer', option='min_num', obj=cls, id='admin.E205') + else: + return [] + + def _check_formset(self, cls): + """ Check formset is a subclass of BaseModelFormSet. """ + + if not issubclass(cls.formset, BaseModelFormSet): + return must_inherit_from(parent='BaseModelFormSet', option='formset', + obj=cls, id='admin.E206') + else: + return [] + + +def must_be(type, option, obj, id): + return [ + checks.Error( + "The value of '%s' must be %s." % (option, type), + hint=None, + obj=obj, + id=id, + ), + ] + + +def must_inherit_from(parent, option, obj, id): + return [ + checks.Error( + "The value of '%s' must inherit from '%s'." % (option, parent), + hint=None, + obj=obj, + id=id, + ), + ] + + +def refer_to_missing_field(field, option, model, obj, id): + return [ + checks.Error( + "The value of '%s' refers to '%s', which is not an attribute of '%s.%s'." % ( + option, field, model._meta.app_label, model._meta.object_name + ), + hint=None, + obj=obj, + id=id, + ), + ] diff -Nru python-django-1.6.6/django/contrib/admin/decorators.py python-django-1.7.4/django/contrib/admin/decorators.py --- python-django-1.6.6/django/contrib/admin/decorators.py 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/decorators.py 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,28 @@ +def register(*models, **kwargs): + """ + Registers the given model(s) classes and wrapped ModelAdmin class with + admin site: + + @register(Author) + class AuthorAdmin(admin.ModelAdmin): + pass + + A kwarg of `site` can be passed as the admin site, otherwise the default + admin site will be used. + """ + from django.contrib.admin import ModelAdmin + from django.contrib.admin.sites import site, AdminSite + + def _model_admin_wrapper(admin_class): + admin_site = kwargs.pop('site', site) + + if not isinstance(admin_site, AdminSite): + raise ValueError('site must subclass AdminSite') + + if not issubclass(admin_class, ModelAdmin): + raise ValueError('Wrapped class must subclass ModelAdmin.') + + admin_site.register(models, admin_class=admin_class) + + return admin_class + return _model_admin_wrapper diff -Nru python-django-1.6.6/django/contrib/admin/filters.py python-django-1.7.4/django/contrib/admin/filters.py --- python-django-1.6.6/django/contrib/admin/filters.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/filters.py 2015-01-27 17:12:29.000000000 +0000 @@ -12,10 +12,11 @@ from django.utils.encoding import smart_text, force_text from django.utils.translation import ugettext_lazy as _ from django.utils import timezone -from django.contrib.admin.util import (get_model_from_relation, +from django.contrib.admin.utils import (get_model_from_relation, reverse_field_path, get_limit_choices_to_from_path, prepare_lookup_value) from django.contrib.admin.options import IncorrectLookupParameters + class ListFilter(object): title = None # Human-readable title to appear in the right sidebar. template = 'admin/filter.html' @@ -33,26 +34,26 @@ """ Returns True if some choices would be output for this filter. """ - raise NotImplementedError + raise NotImplementedError('subclasses of ListFilter must provide a has_output() method') def choices(self, cl): """ Returns choices ready to be output in the template. """ - raise NotImplementedError + raise NotImplementedError('subclasses of ListFilter must provide a choices() method') def queryset(self, request, queryset): """ Returns the filtered queryset. """ - raise NotImplementedError + raise NotImplementedError('subclasses of ListFilter must provide a queryset() method') def expected_parameters(self): """ Returns the list of parameter names that are expected from the request's query string and that will be used by this filter. """ - raise NotImplementedError + raise NotImplementedError('subclasses of ListFilter must provide an expected_parameters() method') class SimpleListFilter(ListFilter): @@ -66,13 +67,13 @@ raise ImproperlyConfigured( "The list filter '%s' does not specify " "a 'parameter_name'." % self.__class__.__name__) + if self.parameter_name in params: + value = params.pop(self.parameter_name) + self.used_parameters[self.parameter_name] = value lookup_choices = self.lookups(request, model_admin) if lookup_choices is None: lookup_choices = () self.lookup_choices = list(lookup_choices) - if self.parameter_name in params: - value = params.pop(self.parameter_name) - self.used_parameters[self.parameter_name] = value def has_output(self): return len(self.lookup_choices) > 0 @@ -87,9 +88,11 @@ def lookups(self, request, model_admin): """ - Must be overriden to return a list of tuples (value, verbose value) + Must be overridden to return a list of tuples (value, verbose value) """ - raise NotImplementedError + raise NotImplementedError( + 'The SimpleListFilter.lookups() method must be overridden to ' + 'return a list of tuples (value, verbose value)') def expected_parameters(self): return [self.parameter_name] @@ -164,9 +167,8 @@ rel_name = other_model._meta.pk.name self.lookup_kwarg = '%s__%s__exact' % (field_path, rel_name) self.lookup_kwarg_isnull = '%s__isnull' % field_path - self.lookup_val = request.GET.get(self.lookup_kwarg, None) - self.lookup_val_isnull = request.GET.get( - self.lookup_kwarg_isnull, None) + self.lookup_val = request.GET.get(self.lookup_kwarg) + self.lookup_val_isnull = request.GET.get(self.lookup_kwarg_isnull) self.lookup_choices = field.get_choices(include_blank=False) super(RelatedFieldListFilter, self).__init__( field, request, params, model, model_admin, field_path) @@ -177,9 +179,9 @@ self.title = self.lookup_title def has_output(self): - if (isinstance(self.field, models.related.RelatedObject) - and self.field.field.null or hasattr(self.field, 'rel') - and self.field.null): + if (isinstance(self.field, models.related.RelatedObject) and + self.field.field.null or hasattr(self.field, 'rel') and + self.field.null): extra = 1 else: extra = 0 @@ -204,9 +206,9 @@ }, [self.lookup_kwarg_isnull]), 'display': val, } - if (isinstance(self.field, models.related.RelatedObject) - and self.field.field.null or hasattr(self.field, 'rel') - and self.field.null): + if (isinstance(self.field, models.related.RelatedObject) and + self.field.field.null or hasattr(self.field, 'rel') and + self.field.null): yield { 'selected': bool(self.lookup_val_isnull), 'query_string': cl.get_query_string({ @@ -216,8 +218,8 @@ } FieldListFilter.register(lambda f: ( - bool(f.rel) if hasattr(f, 'rel') else - isinstance(f, models.related.RelatedObject)), RelatedFieldListFilter) + bool(f.rel) if hasattr(f, 'rel') else + isinstance(f, models.related.RelatedObject)), RelatedFieldListFilter) class BooleanFieldListFilter(FieldListFilter): @@ -240,16 +242,16 @@ yield { 'selected': self.lookup_val == lookup and not self.lookup_val2, 'query_string': cl.get_query_string({ - self.lookup_kwarg: lookup, - }, [self.lookup_kwarg2]), + self.lookup_kwarg: lookup, + }, [self.lookup_kwarg2]), 'display': title, } if isinstance(self.field, models.NullBooleanField): yield { 'selected': self.lookup_val2 == 'True', 'query_string': cl.get_query_string({ - self.lookup_kwarg2: 'True', - }, [self.lookup_kwarg]), + self.lookup_kwarg2: 'True', + }, [self.lookup_kwarg]), 'display': _('Unknown'), } @@ -277,7 +279,7 @@ yield { 'selected': smart_text(lookup) == self.lookup_val, 'query_string': cl.get_query_string({ - self.lookup_kwarg: lookup}), + self.lookup_kwarg: lookup}), 'display': title, } @@ -287,8 +289,8 @@ class DateFieldListFilter(FieldListFilter): def __init__(self, field, request, params, model, model_admin, field_path): self.field_generic = '%s__' % field_path - self.date_params = dict([(k, v) for k, v in params.items() - if k.startswith(self.field_generic)]) + self.date_params = dict((k, v) for k, v in params.items() + if k.startswith(self.field_generic)) now = timezone.now() # When time zone support is enabled, convert "now" to the user's time @@ -339,7 +341,7 @@ yield { 'selected': self.date_params == param_dict, 'query_string': cl.get_query_string( - param_dict, [self.field_generic]), + param_dict, [self.field_generic]), 'display': title, } diff -Nru python-django-1.6.6/django/contrib/admin/forms.py python-django-1.7.4/django/contrib/admin/forms.py --- python-django-1.6.6/django/contrib/admin/forms.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/forms.py 2015-01-27 17:12:29.000000000 +0000 @@ -2,32 +2,24 @@ from django import forms -from django.contrib.auth import authenticate from django.contrib.auth.forms import AuthenticationForm -from django.utils.translation import ugettext_lazy - -ERROR_MESSAGE = ugettext_lazy("Please enter the correct %(username)s and password " - "for a staff account. Note that both fields may be case-sensitive.") +from django.utils.translation import ugettext_lazy as _ class AdminAuthenticationForm(AuthenticationForm): """ A custom authentication form used in the admin app. - """ - this_is_the_login_form = forms.BooleanField(widget=forms.HiddenInput, initial=1, - error_messages={'required': ugettext_lazy("Please log in again, because your session has expired.")}) - - def clean(self): - username = self.cleaned_data.get('username') - password = self.cleaned_data.get('password') - message = ERROR_MESSAGE - params = {'username': self.username_field.verbose_name} - - if username and password: - self.user_cache = authenticate(username=username, password=password) - if self.user_cache is None: - raise forms.ValidationError(message, code='invalid', params=params) - elif not self.user_cache.is_active or not self.user_cache.is_staff: - raise forms.ValidationError(message, code='invalid', params=params) - return self.cleaned_data + error_messages = { + 'invalid_login': _("Please enter the correct %(username)s and password " + "for a staff account. Note that both fields may be " + "case-sensitive."), + } + + def confirm_login_allowed(self, user): + if not user.is_active or not user.is_staff: + raise forms.ValidationError( + self.error_messages['invalid_login'], + code='invalid_login', + params={'username': self.username_field.verbose_name} + ) diff -Nru python-django-1.6.6/django/contrib/admin/helpers.py python-django-1.7.4/django/contrib/admin/helpers.py --- python-django-1.6.6/django/contrib/admin/helpers.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/helpers.py 2015-01-27 17:12:29.000000000 +0000 @@ -1,14 +1,13 @@ from __future__ import unicode_literals from django import forms -from django.contrib.admin.util import (flatten_fieldsets, lookup_field, +from django.contrib.admin.utils import (flatten_fieldsets, lookup_field, display_for_field, label_for_field, help_text_for_field) from django.contrib.admin.templatetags.admin_static import static -from django.contrib.contenttypes.models import ContentType from django.core.exceptions import ObjectDoesNotExist from django.db.models.fields.related import ManyToManyRel -from django.forms.util import flatatt -from django.template.defaultfilters import capfirst +from django.forms.utils import flatatt +from django.template.defaultfilters import capfirst, linebreaksbr from django.utils.encoding import force_text, smart_text from django.utils.html import conditional_escape, format_html from django.utils.safestring import mark_safe @@ -19,6 +18,7 @@ ACTION_CHECKBOX_NAME = '_selected_action' + class ActionForm(forms.Form): action = forms.ChoiceField(label=_('Action:')) select_across = forms.BooleanField(label='', required=False, initial=0, @@ -26,9 +26,10 @@ checkbox = forms.CheckboxInput({'class': 'action-select'}, lambda value: False) + class AdminForm(object): def __init__(self, form, fieldsets, prepopulated_fields, readonly_fields=None, model_admin=None): - self.form, self.fieldsets = form, normalize_fieldsets(fieldsets) + self.form, self.fieldsets = form, fieldsets self.prepopulated_fields = [{ 'field': form[field_name], 'dependencies': [form[f] for f in dependencies] @@ -40,26 +41,13 @@ def __iter__(self): for name, options in self.fieldsets: - yield Fieldset(self.form, name, + yield Fieldset( + self.form, name, readonly_fields=self.readonly_fields, model_admin=self.model_admin, **options ) - def first_field(self): - try: - fieldset_name, fieldset_options = self.fieldsets[0] - field_name = fieldset_options['fields'][0] - if not isinstance(field_name, six.string_types): - field_name = field_name[0] - return self.form[field_name] - except (KeyError, IndexError): - pass - try: - return next(iter(self.form)) - except StopIteration: - return None - def _media(self): media = self.form.media for fs in self: @@ -67,6 +55,7 @@ return media media = property(_media) + class Fieldset(object): def __init__(self, form, name=None, readonly_fields=(), fields=(), classes=(), description=None, model_admin=None): @@ -91,13 +80,17 @@ for field in self.fields: yield Fieldline(self.form, field, self.readonly_fields, model_admin=self.model_admin) + class Fieldline(object): def __init__(self, form, field, readonly_fields=None, model_admin=None): - self.form = form # A django.forms.Form instance + self.form = form # A django.forms.Form instance if not hasattr(field, "__iter__") or isinstance(field, six.text_type): self.fields = [field] else: self.fields = field + self.has_visible_field = not all(field in self.form.fields and + self.form.fields[field].widget.is_hidden + for field in self.fields) self.model_admin = model_admin if readonly_fields is None: readonly_fields = () @@ -112,12 +105,13 @@ yield AdminField(self.form, field, is_first=(i == 0)) def errors(self): - return mark_safe('\n'.join([self.form[f].errors.as_ul() for f in self.fields if f not in self.readonly_fields]).strip('\n')) + return mark_safe('\n'.join(self.form[f].errors.as_ul() for f in self.fields if f not in self.readonly_fields).strip('\n')) + class AdminField(object): def __init__(self, form, field, is_first): - self.field = form[field] # A django.forms.BoundField instance - self.is_first = is_first # Whether this field is first on the line + self.field = form[field] # A django.forms.BoundField instance + self.is_first = is_first # Whether this field is first on the line self.is_checkbox = isinstance(self.field.field.widget, forms.CheckboxInput) def label_tag(self): @@ -139,9 +133,9 @@ def errors(self): return mark_safe(self.field.errors.as_ul()) + class AdminReadonlyField(object): def __init__(self, form, field, is_first, model_admin=None): - label = label_for_field(field, form._meta.model, model_admin) # Make self.field look a little bit like a field. This means that # {{ field.name }} must be a useful class name to identify the field. # For convenience, store other field-related data here too. @@ -149,11 +143,22 @@ class_name = field.__name__ if field.__name__ != '' else '' else: class_name = field + + if form._meta.labels and class_name in form._meta.labels: + label = form._meta.labels[class_name] + else: + label = label_for_field(field, form._meta.model, model_admin) + + if form._meta.help_texts and class_name in form._meta.help_texts: + help_text = form._meta.help_texts[class_name] + else: + help_text = help_text_for_field(class_name, form._meta.model) + self.field = { 'name': class_name, 'label': label, + 'help_text': help_text, 'field': field, - 'help_text': help_text_for_field(class_name, form._meta.model) } self.form = form self.model_admin = model_admin @@ -187,6 +192,8 @@ result_repr = smart_text(value) if getattr(attr, "allow_tags", False): result_repr = mark_safe(result_repr) + else: + result_repr = linebreaksbr(result_repr) else: if isinstance(f.rel, ManyToManyRel) and value is not None: result_repr = ", ".join(map(six.text_type, value.all())) @@ -194,6 +201,7 @@ result_repr = display_for_field(value, f) return conditional_escape(result_repr) + class InlineAdminFormSet(object): """ A wrapper around an inline formset for use in the admin system. @@ -213,9 +221,10 @@ def __iter__(self): for form, original in zip(self.formset.initial_forms, self.formset.get_queryset()): + view_on_site_url = self.opts.get_view_on_site_url(original) yield InlineAdminForm(self.formset, form, self.fieldsets, self.prepopulated_fields, original, self.readonly_fields, - model_admin=self.opts) + model_admin=self.opts, view_on_site_url=view_on_site_url) for form in self.formset.extra_forms: yield InlineAdminForm(self.formset, form, self.fieldsets, self.prepopulated_fields, None, self.readonly_fields, @@ -248,18 +257,23 @@ return media media = property(_media) + class InlineAdminForm(AdminForm): """ A wrapper around an inline form for use in the admin system. """ def __init__(self, formset, form, fieldsets, prepopulated_fields, original, - readonly_fields=None, model_admin=None): + readonly_fields=None, model_admin=None, view_on_site_url=None): self.formset = formset self.model_admin = model_admin self.original = original if original is not None: + # Since this module gets imported in the application's root package, + # it cannot import models from other applications at the module level. + from django.contrib.contenttypes.models import ContentType self.original_content_type_id = ContentType.objects.get_for_model(original).pk - self.show_url = original and hasattr(original, 'get_absolute_url') + self.show_url = original and view_on_site_url is not None + self.absolute_url = view_on_site_url super(InlineAdminForm, self).__init__(form, fieldsets, prepopulated_fields, readonly_fields, model_admin) @@ -309,6 +323,7 @@ from django.forms.formsets import ORDERING_FIELD_NAME return AdminField(self.form, ORDERING_FIELD_NAME, False) + class InlineFieldset(Fieldset): def __init__(self, formset, *args, **kwargs): self.formset = formset @@ -322,35 +337,17 @@ yield Fieldline(self.form, field, self.readonly_fields, model_admin=self.model_admin) -class AdminErrorList(forms.util.ErrorList): + +class AdminErrorList(forms.utils.ErrorList): """ Stores all errors for the form/formsets in an add/change stage view. """ def __init__(self, form, inline_formsets): + super(AdminErrorList, self).__init__() + if form.is_bound: self.extend(list(six.itervalues(form.errors))) for inline_formset in inline_formsets: self.extend(inline_formset.non_form_errors()) for errors_in_inline_form in inline_formset.errors: self.extend(list(six.itervalues(errors_in_inline_form))) - -def normalize_fieldsets(fieldsets): - """ - Make sure the keys in fieldset dictionaries are strings. Returns the - normalized data. - """ - result = [] - for name, options in fieldsets: - result.append((name, normalize_dictionary(options))) - return result - -def normalize_dictionary(data_dict): - """ - Converts all the keys in "data_dict" to strings. The keys must be - convertible using str(). - """ - for key, value in data_dict.items(): - if not isinstance(key, str): - del data_dict[key] - data_dict[str(key)] = value - return data_dict diff -Nru python-django-1.6.6/django/contrib/admin/__init__.py python-django-1.7.4/django/contrib/admin/__init__.py --- python-django-1.6.6/django/contrib/admin/__init__.py 2014-08-20 19:57:06.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/__init__.py 2015-01-27 17:12:29.000000000 +0000 @@ -1,41 +1,26 @@ # ACTION_CHECKBOX_NAME is unused, but should stay since its import from here # has been referenced in documentation. +from django.contrib.admin.decorators import register from django.contrib.admin.helpers import ACTION_CHECKBOX_NAME -from django.contrib.admin.options import ModelAdmin, HORIZONTAL, VERTICAL -from django.contrib.admin.options import StackedInline, TabularInline -from django.contrib.admin.sites import AdminSite, site +from django.contrib.admin.options import (HORIZONTAL, VERTICAL, + ModelAdmin, StackedInline, TabularInline) from django.contrib.admin.filters import (ListFilter, SimpleListFilter, FieldListFilter, BooleanFieldListFilter, RelatedFieldListFilter, ChoicesFieldListFilter, DateFieldListFilter, AllValuesFieldListFilter) +from django.contrib.admin.sites import AdminSite, site +from django.utils.module_loading import autodiscover_modules +__all__ = [ + "register", "ACTION_CHECKBOX_NAME", "ModelAdmin", "HORIZONTAL", "VERTICAL", + "StackedInline", "TabularInline", "AdminSite", "site", "ListFilter", + "SimpleListFilter", "FieldListFilter", "BooleanFieldListFilter", + "RelatedFieldListFilter", "ChoicesFieldListFilter", "DateFieldListFilter", + "AllValuesFieldListFilter", "autodiscover", +] -def autodiscover(): - """ - Auto-discover INSTALLED_APPS admin.py modules and fail silently when - not present. This forces an import on them to register any admin bits they - may want. - """ - import copy - from django.conf import settings - from django.utils.importlib import import_module - from django.utils.module_loading import module_has_submodule +def autodiscover(): + autodiscover_modules('admin', register_to=site) - for app in settings.INSTALLED_APPS: - mod = import_module(app) - # Attempt to import the app's admin module. - try: - before_import_registry = copy.copy(site._registry) - import_module('%s.admin' % app) - except: - # Reset the model registry to the state before the last import as - # this import will have to reoccur on the next request and this - # could raise NotRegistered and AlreadyRegistered exceptions - # (see #8245). - site._registry = before_import_registry - # Decide whether to bubble up this error. If the app just - # doesn't have an admin module, we can ignore the error - # attempting to import it, otherwise we want it to bubble up. - if module_has_submodule(mod, 'admin'): - raise +default_app_config = 'django.contrib.admin.apps.AdminConfig' Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/af/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Piet Delport , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Afrikaans (http://www.transifex.com/projects/p/django/" "language/af/)\n" "MIME-Version: 1.0\n" @@ -17,153 +17,173 @@ "Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Beskikbare %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Kies alle" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Kies" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Verwyder" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Gekose %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Verwyder alle" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Wys" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Versteek" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nou" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Klok" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Kies 'n tyd" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Middernag" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 v.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Middag" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Kanselleer" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Vandag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Gister" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Môre" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Wys" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Versteek" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/af/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/af/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/af/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/af/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/af/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/af/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,10 @@ # Piet Delport , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Afrikaans (http://www.transifex.com/projects/p/django/" "language/af/)\n" @@ -18,156 +18,159 @@ "Language: af\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Het %(count)d %(items)s suksesvol geskrap." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Kan %(name)s nie skrap nie" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Is jy seker?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Skrap gekose %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alles" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Geen" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Onbekend" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Enige datum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Vandag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Vorige 7 dae" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Hierdie maand" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Hierdie jaar" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Teken asseblief weer in, want jou sessie het verstryk." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Aksie:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "aksie tyd" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objek id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objek repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "aksie vlag" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "verandering boodskap" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Het \"%(object)s\" bygevoeg." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Het \"%(object)s\" verander - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Het \"%(object)s\" geskrap." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "None" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Het %s verander." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "en" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Het %(name)s \"%(object)s\" bygevoeg." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Het %(list)s vir %(name)s \"%(object)s\" verander." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Het %(name)s \"%(object)s\" geskrap." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Geen velde verander nie." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -175,38 +178,38 @@ "Die %(name)s \"%(obj)s\" was suksesvol verander. Jy mag dit weereens " "hieronder wysig." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Die %(name)s \"%(obj)s\" was suksesvol bygevoeg." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Die %(name)s \"%(obj)s\" was suksesvol verander." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -214,268 +217,277 @@ "Items moet gekies word om aksies op hulle uit te voer. Geen items is " "verander." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Geen aksie gekies nie." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Voeg %s by" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Die %(name)s \"%(obj)s\" was suksesvol geskrap." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s voorwerp met primêre sleutel %(key)r bestaan ​​nie." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Voeg %s by" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Verander %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Databasis fout" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s was suksesvol verander." msgstr[1] "%(count)s %(name)s was suksesvol verander." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s gekies" msgstr[1] "Al %(total_count)s gekies" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 uit %(cnt)s gekies" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Die %(name)s \"%(obj)s\" was suksesvol geskrap." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Verander geskiedenis: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Teken in" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django werf admin" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administrasie" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Werf administrasie" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administrasie" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tyd:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Soek" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Voeg nog een by" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Teken in" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Bladsy nie gevind nie" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Ons is jammer, maar die aangevraagde bladsy kon nie gevind word nie." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Tuisblad" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Bedienerfout" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Bedienerfout (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Bedienerfout (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Hardloop die gekose aksie" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Gaan" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kliek hier om die objekte oor alle bladsye te kies." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Kies al %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Verwyder keuses" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Vul eers 'n gebruikersnaam en wagwoord in. Dan sal jy in staat wees om meer " +"gebruikersopsies te wysig." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Vul 'n gebruikersnaam en wagwoord in." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Verander wagwoord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Korrigeer asseblief die foute hieronder." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Vul 'n nuwe wagwoord vir gebruiker %(username)s in." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Wagwoord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Wagwoord (weer)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Vul dieselfde wagwoord in as hierbo, for bevestiging." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Welkom," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentasie" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Verander wagwoord" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Teken uit" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django werf admin" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administrasie" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Voeg by" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Geskiedenis" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Bekyk op werf" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Korrigeer asseblief die foute hieronder." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Voeg %(name)s by" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Verwyder van sortering" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sortering prioriteit: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Wissel sortering" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Skrap" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -483,7 +495,7 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -492,23 +504,23 @@ "Om die %(object_name)s '%(escaped_object)s' te skrap sou vereis dat die " "volgende beskermde verwante objekte geskrap word:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, ek is seker" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Skrap meerdere objekte" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -518,7 +530,7 @@ "Om die gekose %(objects_name)s te skrap sou verwante objekte skrap, maar jou " "rekening het nie toestemming om die volgende tipes objekte te skrap nie:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -527,7 +539,7 @@ "Om die gekose %(objects_name)s te skrap veries dat die volgende beskermde " "verwante objekte geskrap word:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -536,68 +548,83 @@ "Is jy seker jy wil die gekose %(objects_name)s skrap? Al die volgende " "objekte en hul verwante items sal geskrap word:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Verwyder" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Voeg nog 'n %(verbose_name)s by" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Skrap?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Deur %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Verander" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Jy het nie toestemming om enigiets te wysig nie." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Onlangse Aksies" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "My Aksies" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Niks beskikbaar nie" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Onbekend inhoud" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Wagwoord:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Wagwoord of gebruikersnaam vergeet?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/tyd" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Gebruiker" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Aksie" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -605,112 +632,61 @@ "Hierdie item het nie 'n veranderingsgeskiedenis nie. Dit was waarskynlik nie " "deur middel van hierdie admin werf bygevoeg nie." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Wys alle" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Stoor" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Soek" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultaat" msgstr[1] "%(counter)s resultate" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s in totaal" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Stoor as nuwe" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Stoor en voeg 'n ander by" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Stoor en wysig verder" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Vul eers 'n gebruikersnaam en wagwoord in. Dan sal jy in staat wees om meer " -"gebruikersopsies te wysig." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Vul 'n gebruikersnaam en wagwoord in." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Vul 'n nuwe wagwoord vir gebruiker %(username)s in." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Wagwoord" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Wagwoord (weer)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Vul dieselfde wagwoord in as hierbo, for bevestiging." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Verwyder" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Voeg nog 'n %(verbose_name)s by" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Skrap?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Teken weer in" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Wagwoord verandering" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Wagwoord verandering suksesvol" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Jou wagwoord was verander." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -718,46 +694,34 @@ "Tik jou ou wagwoord, ter wille van sekuriteit's, en dan 'n nuwe wagwoord " "twee keer so dat ons kan seker wees dat jy dit korrek ingetik het." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Ou wagwoord" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nuwe wagwoord" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Verander my wagwoord" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Wagwoord herstel" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Wagwoord herstel voltooi" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Jou wagwoord is gestel. Jy kan nou voort gaan en aanteken." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Wagwoord herstel bevestiging" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Vul 'n nuwe wagwoord in" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -765,93 +729,108 @@ "Tik jou nuwe wagwoord twee keer in so ons kan seker wees dat jy dit korrek " "ingetik het." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nuwe wagwoord:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Bevestig wagwoord:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Wagwoord herstel onsuksesvol" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Wagwoord herstel suksesvol" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Gaan asseblief na die volgende bladsy en kies 'n nuwe wagwoord:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Jou gebruikersnaam, in geval jy vergeet het:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Dankie vir die gebruik van ons webwerf!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Die %(site_name)s span" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Herstel my wagwoord" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alle datums" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Geen)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Kies %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Kies %s om te verander" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tyd:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Soek" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Voeg nog een by" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ar/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,14 +1,15 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Bashar Al-Abdulhadi, 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 17:17+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" @@ -18,12 +19,12 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s المتوفرة" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +33,38 @@ "هذه قائمة %s المتوفرة. يمكنك اختيار بعضها بانتقائها في الصندوق أدناه ثم " "الضغط على سهم الـ\"اختيار\" بين الصندوقين." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "اكتب في هذا الصندوق لتصفية قائمة %s المتوفرة." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "انتقاء" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "اختر الكل" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "اضغط لاختيار جميع %s جملة واحدة." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "اختيار" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "احذف" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s المُختارة" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,16 +73,17 @@ "هذه قائمة %s المحددة. يمكنك إزالة بعضها باختيارها في الصندوق أدناه ثم اضغط " "على سهم الـ\"إزالة\" بين الصندوقين." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "إزالة الكل" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "اضغط لإزالة جميع %s المحددة جملة واحدة." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "لا شي محدد" @@ -91,7 +93,8 @@ msgstr[4] "%(sel)s من %(cnt)s محدد" msgstr[5] "%(sel)s من %(cnt)s محدد" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +102,8 @@ "لديك تعديلات غير محفوظة على بعض الحقول القابلة للتعديل. إن نفذت أي إجراء " "فسوف تخسر تعديلاتك." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,76 +112,101 @@ "اخترت إجراءً لكن دون أن تحفظ تغييرات التي قمت بها. رجاء اضغط زر الموافقة " "لتحفظ تعديلاتك. ستحتاج إلى إعادة تنفيذ الإجراء." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "اخترت إجراءً دون تغيير أي حقل. لعلك تريد زر التنفيذ بدلاً من زر الحفظ." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"يناير فبراير مارس إبريل مايو يونيو يوليو أغسطس سبتمبر أكتوبر نوفمبر ديسمبر" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "أ إ ث أ خ ج س" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "أظهر" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "اخف" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[1] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[2] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[3] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[4] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." +msgstr[5] "ملاحظة: أنت متقدم بـ %s ساعة من وقت الخادم." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[1] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[2] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[3] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[4] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." +msgstr[5] "ملاحظة: أنت متأخر بـ %s ساعة من وقت الخادم." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "الآن" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "الساعة" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "اختر وقتاً" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "منتصف الليل" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 ص." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "الظهر" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "ألغ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "اليوم" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "التقويم" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "أمس" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "غداً" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"يناير فبراير مارس إبريل مايو يونيو يوليو أغسطس سبتمبر أكتوبر نوفمبر ديسمبر" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "أ إ ث أ خ ج س" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "أظهر" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "اخف" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ar/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ar/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ar/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ar/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ar/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# dado_eyad , 2013 +# Bashar Al-Abdulhadi, 2014 +# Eyad Toma , 2013 # 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-28 09:21+0000\n" -"Last-Translator: dado_eyad \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-23 21:53+0000\n" +"Last-Translator: Ahmad Khayyat \n" "Language-Team: Arabic (http://www.transifex.com/projects/p/django/language/" "ar/)\n" "MIME-Version: 1.0\n" @@ -19,222 +20,230 @@ "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 " "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "تم حذف %(count)d %(items)s بنجاح." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "لا يمكن حذف %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "هل أنت متأكد؟" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "حذف سجلات %(verbose_name_plural)s المحددة" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "الإدارة" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "الكل" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "نعم" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "لا" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "مجهول" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "أي تاريخ" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "اليوم" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "الأيام السبعة الماضية" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "هذا الشهر" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "هذه السنة" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "الرجاء إدخال ال%(username)s و كلمة السر الصحيحين لحساب الطاقم." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "رجاءً ادخل مرةً أخرى لأن جلستك انتهت." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "إجراء:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "وقت الإجراء" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "معرف العنصر" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "ممثل العنصر" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "علامة الإجراء" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "غيّر الرسالة" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "مُدخل السجل" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "مُدخلات السجل" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "تم إضافة العناصر \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "تم تعديل العناصر \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "تم حذف العناصر \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "كائن LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "لاشيء" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "عدّل %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "و" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "أضاف %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "غيّر %(list)s في %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "حذف %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "لم يتم تغيير أية حقول." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى بالأسفل." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "تمت إضافة %(name)s \"%(obj)s\" بنجاح، يمكنك إضافة %(name)s أخر أدناه." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "تم اضافة %(name)s \"%(obj)s\" بنجاح." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "تم تعديل %(name)s \"%(obj)s\" بنجاح، يمكنك تعديله مرة أخرى أدناه." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "تم تعديل %(name)s \"%(obj)s\" بنجاح، يمكنك إضافة %(name)s أخر أدناه." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "تم تغيير %(name)s \"%(obj)s\" بنجاح." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "يجب تحديد العناصر لتطبيق الإجراءات عليها. لم يتم تغيير أية عناصر." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "لم يحدد أي إجراء." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "أضف %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "العنصر %(name)s الذي به الحقل الأساسي %(key)r غير موجود." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "أضف %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "عدّل %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "خطـأ في قاعدة البيانات" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -245,7 +254,7 @@ msgstr[4] "تم تغيير %(count)s %(name)s بنجاح." msgstr[5] "تم تغيير %(count)s %(name)s بنجاح." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -256,29 +265,24 @@ msgstr[4] "تم تحديد %(total_count)s" msgstr[5] "تم تحديد %(total_count)s" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "لا شيء محدد من %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "تم حذف %(name)s \"%(obj)s\" بنجاح." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "تاريخ التغيير: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -287,83 +291,71 @@ "حذف %(class_name)s %(instance)s سيتسبب أيضاً بحذف العناصر المرتبطة التالية: " "%(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ادخل" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "إدارة موقع جانغو" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "إدارة جانغو" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "إدارة الموقع" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "إدارة %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "التاريخ:" - -#: widgets.py:91 -msgid "Time:" -msgstr "الوقت:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "ابحث" - -#: widgets.py:260 -msgid "Add Another" -msgstr "أضف آخر" - -#: widgets.py:302 -msgid "Currently:" -msgstr "حالياً:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ادخل" -#: widgets.py:303 -msgid "Change:" -msgstr "تغيير:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "إدارة %(app)s " -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "تعذر العثور على الصفحة" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "نحن آسفون، لكننا لم نعثر على الصفحة المطلوبة." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "الرئيسية" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "خطأ في المزود" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "خطأ في المزود (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "خطأ في المزود (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -371,120 +363,141 @@ "كان هناك خطأ. تم إعلام المسؤولين عن الموقع عبر البريد الإلكتروني وسوف يتم " "إصلاح الخطأ قريباً. شكراً على صبركم." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "نفذ الإجراء المحدّد" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "نفّذ" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "اضغط هنا لتحديد جميع العناصر في جميع الصفحات" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "اختيار %(total_count)s %(module_name)s جميعها" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "إزالة الاختيار" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"أولاً، أدخل اسم مستخدم وكلمة مرور. ومن ثم تستطيع تعديل المزيد من خيارات " +"المستخدم." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "أدخل اسم مستخدم وكلمة مرور." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "غيّر كلمة المرور" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "الرجاء تصحيح الخطأ أدناه." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "الرجاء تصحيح الأخطاء أدناه." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "أدخل كلمة مرور جديدة للمستخدم %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "كلمة المرور" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "كلمة المرور (مجدداً)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "أهلا، " -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "الوثائق" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "غيّر كلمة المرور" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "اخرج" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "إدارة موقع جانغو" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "إدارة جانغو" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "أضف" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "تاريخ" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "مشاهدة على الموقع" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "الرجاء تصحيح الخطأ أدناه." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "الرجاء تصحيح الأخطاء أدناه." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "أضف %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "مرشّح" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "إزالة من الترتيب" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "أولوية الترتيب: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "عكس الترتيب" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "احذف" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -494,7 +507,7 @@ "حذف العنصر %(object_name)s '%(escaped_object)s' سيتسبب بحذف العناصر المرتبطة " "به، إلا أنك لا تملك صلاحية حذف العناصر التالية:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -503,7 +516,7 @@ "حذف %(object_name)s '%(escaped_object)s' سيتسبب أيضاً بحذف العناصر المرتبطة، " "إلا أن حسابك ليس لديه صلاحية حذف أنواع العناصر التالية:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -512,16 +525,16 @@ "متأكد أنك تريد حذف العنصر %(object_name)s \"%(escaped_object)s\"؟ سيتم حذف " "جميع العناصر التالية المرتبطة به:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "نعم، أنا متأكد" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "حذف عدّة عناصر" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -531,7 +544,7 @@ "حذف عناصر %(objects_name)s المُحدّدة سيتسبب بحذف العناصر المرتبطة، إلا أن " "حسابك ليس له صلاحية حذف أنواع العناصر التالية:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -540,7 +553,7 @@ "حذف عناصر %(objects_name)s المحدّدة قد يتطلب حذف العناصر المحميّة المرتبطة " "التالية:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -549,41 +562,56 @@ "أأنت متأكد أنك تريد حذف عناصر %(objects_name)s المحددة؟ جميع العناصر التالية " "والعناصر المرتبطة بها سيتم حذفها:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "أزل" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "إضافة سجل %(verbose_name)s آخر" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "احذفه؟" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " حسب %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "النماذج في تطبيق %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "عدّل" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "ليست لديك الصلاحية لتعديل أي شيء." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "آخر الإجراءات" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "إجراءاتي" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "لا يوجد" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "مُحتوى مجهول" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -592,27 +620,27 @@ "هنالك أمر خاطئ في تركيب قاعدة بياناتك، تأكد من أنه تم انشاء جداول قاعدة " "البيانات الملائمة، وأن قاعدة البيانات قابلة للقراءة من قبل المستخدم الملائم." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "كلمة المرور:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "نسيت كلمة السر أو اسم المستخدم الخاص بك؟" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "التاريخ/الوقت" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "المستخدم" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "إجراء" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -620,19 +648,20 @@ "ليس لهذا العنصر سجلّ تغييرات، على الأغلب أنه لم يُنشأ من خلال نظام إدارة " "الموقع." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "أظهر الكل" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "احفظ" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "ابحث" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -643,93 +672,41 @@ msgstr[4] "%(counter)s نتيجة" msgstr[5] "%(counter)s نتيجة" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "المجموع %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "احفظ كجديد" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "احفظ وأضف آخر" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "احفظ واستمر بالتعديل" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"أولاً، أدخل اسم مستخدم وكلمة مرور. ومن ثم تستطيع تعديل المزيد من خيارات " -"المستخدم." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "أدخل اسم مستخدم وكلمة مرور." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "أدخل كلمة مرور جديدة للمستخدم %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "كلمة المرور" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "كلمة المرور (مجدداً)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "أدخل كلمة المرور ذاتها التي أعلاه لتأكيدها." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "أزل" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "إضافة سجل %(verbose_name)s آخر" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "احذفه؟" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "شكراً لك على قضائك بعض الوقت مع الموقع اليوم." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ادخل مجدداً" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "غيّر كلمة مرورك" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "تم تغيير كلمة المرور بنجاح" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "تمّ تغيير كلمة مرورك." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -737,64 +714,48 @@ "رجاءً أدخل كلمة مرورك القديمة، للأمان، ثم أدخل كلمة مرور الجديدة مرتين كي " "تتأكّد من كتابتها بشكل صحيح." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "كلمة المرور القديمة" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "كلمة المرور الجديدة" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "غيّر كلمة مروري" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "استعادة كلمة المرور" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "تم استعادة كلمة المرور" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "تم تعيين كلمة مرورك. يمكن الاستمرار وتسجيل دخولك الآن." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "تأكيد استعادة كلمة المرور" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "أدخل كلمة المرور الجديدة" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "رجاءً أدخل كلمة مرورك الجديدة مرتين كي تتأكّد من كتابتها بشكل صحيح." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "كلمة المرور الجديدة:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "أكّد كلمة المرور:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "تم إعادة تعيين كلمة المرور بنجاح" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -802,12 +763,7 @@ "رابط استعادة كلمة المرور غير صحيح، ربما لأنه استُخدم من قبل. رجاءً اطلب " "استعادة كلمة المرور مرة أخرى." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "تم إعادة ضبط كلمة المرور بنجاح" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -815,7 +771,7 @@ "تم إرسال بريد إلكتروني بالتعليمات لوضع كلمة السر الخاصة بك. سوف تستقبل " "البريد الإلكتروني قريباً" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -823,7 +779,7 @@ "في حال عدم إستقبال البريد الإلكتروني، الرجاء التأكد من إدخال عنوان بريدك " "الإلكتروني بشكل صحيح ومراجعة مجلد الرسائل غير المرغوب فيها." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -832,24 +788,24 @@ "لقد قمت بتلقى هذه الرسالة لطلبك بإعادة تعين كلمة السر لحسابك الشخصي على " "%(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "رجاءً اذهب إلى الصفحة التالية واختر كلمة مرور جديدة:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "اسم المستخدم الخاص بك، في حال كنت قد نسيته:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "شكراً لاستخدامك موقعنا!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "فريق %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -857,28 +813,52 @@ "هل فقدت كلمة السر؟ أدخل عنوان بريدك الإلكتروني أدناه وسوف نقوم بإرسال " "تعليمات للحصول على كلمة سر جديدة." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "عنوان البريد الإلكتروني:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "استعد كلمة مروري" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "كافة التواريخ" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(لاشيء)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "اختر %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "اختر %s لتغييره" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "التاريخ:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "الوقت:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "ابحث" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "أضف آخر" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "حالياً:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "تغيير:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ast/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,197 @@ +# 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-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-29 07:09+0000\n" +"Last-Translator: Ḷḷumex03 \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" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "Disponible %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "Filtrar" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "Escoyer too" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "Primi pa escoyer too %s d'una vegada" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "Escoyer" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "Desaniciar" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "Escoyíu %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "Desaniciar too" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "Primi pa desaniciar tolo escoyío %s d'una vegada" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "%(sel)s de %(cnt)s esbilláu" +msgstr[1] "%(sel)s de %(cnt)s esbillaos" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" +"Esbillesti una aición, pero entá nun guardesti les tos camudancies nos " +"campos individuales. Por favor, primi Aceutar pa guardar. Necesitarás " +"executar de nueves la aición" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" +"Esbillesti una aición, y nun fixesti camudancia dala nos campos " +"individuales. Quiciabes teas guetando'l botón Dir en cuantes del botón " +"Guardar." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "Agora" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "Reló" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "Escueyi una hora" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "Media nueche" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "Meudía" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "Encaboxar" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "Güei" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "Calandariu" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "Ayeri" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "Mañana" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Xineru Febreru Marzu Abril Mayu Xunu Xunetu Agostu Setiembre Ochobre Payares " +"Avientu" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Amosar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Anubrir" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ast/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ast/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ast/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ast/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ast/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ast/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,819 @@ +# 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-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+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" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "desanciáu con ésitu %(count)d %(items)s." + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "Nun pue desaniciase %(name)s" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "¿De xuru?" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "Too" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "Sí" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "Non" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "Desconocíu" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "Cualaquier data" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "Güei" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "Esti mes" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "Esi añu" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "Aición:" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "Amestáu \"%(object)s\"." + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "" + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "y" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "" + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "" + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "" + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "" + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" +"Los oxetos tienen d'usase pa faer aiciones con ellos. Nun se camudó dengún " +"oxetu." + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "Nun s'esbilló denguna aición." + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Amestar %s" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "Esbillaos 0 de %(cnt)s" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Aniciar sesión" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "Nun s'alcontró la páxina" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Sentímoslo, pero nun s'alcuentra la páxina solicitada." + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" +"Hebo un erru. Repotóse al sitiu d'alministradores per corréu y debería " +"d'iguase en pocu tiempu. Gracies pola to paciencia." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Executar l'aición esbillada" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Dir" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "Esbillar too %(total_count)s %(module_name)s" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "Llimpiar esbilla" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "Bienllegáu/ada," + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "Documentación" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Amestar otru" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Anguaño:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/az/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,25 +4,25 @@ # Ali Ismayilov , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/" "language/az/)\n" "MIME-Version: 1.0\n" "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" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Mümkün %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -31,38 +31,38 @@ "Bu, mümkün %s siyahısıdır. Onlardan bir neçəsini qarşısındakı xanaya işarə " "qoymaq və iki xana arasındakı \"Seç\"i tıqlamaqla seçmək olar." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Bu xanaya yazmaqla mümkün %s siyahısını filtrləyə bilərsiniz." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Süzgəc" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Hamısını seç" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Bütün %s siyahısını seçmək üçün tıqlayın." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Seç" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Yığışdır" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Seçilmiş %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -71,21 +71,24 @@ "Bu, seçilmiş %s siyahısıdır. Onlardan bir neçəsini aşağıdakı xanaya işarə " "qoymaq və iki xana arasındakı \"Sil\"i tıqlamaqla silmək olar." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Hamısını sil" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Seçilmiş %s siyahısının hamısını silmək üçün tıqlayın." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" -msgstr[0] "%(cnt)s-dan %(sel)s seçilib" +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -93,7 +96,8 @@ "Bəzi sahələrdə etdiyiniz dəyişiklikləri hələ yadda saxlamamışıq. Əgər " "əməliyyatı işə salsanız, dəyişikliklər əldən gedəcək." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -103,7 +107,8 @@ "saxlamamışıq. Bunun üçün OK seçməlisiniz. Ondan sonra əməliyyatı yenidən işə " "salmağa cəhd edin." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -112,69 +117,85 @@ "Siz əməliyyatı seçmisiniz və heç bir sahəyə dəyişiklik etməmisiniz. Siz " "yəqin ki, Yadda saxla düyməsini deyil, Getdik düyməsini axtarırsınız." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Yanvar Fevral Mart Aprel May İyun İyul Avqust Sentyabr Oktyabr Noyabr Dekabr" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "B B Ç Ç C C Ş" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Göstər" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Gizlət" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "İndi" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Saat" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Vaxtı seçin" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Gecə yarısı" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Günorta" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Ləğv et" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Bu gün" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Təqvim" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Dünən" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Sabah" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Yanvar Fevral Mart Aprel May İyun İyul Avqust Sentyabr Oktyabr Noyabr Dekabr" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "B B Ç Ç C C Ş" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Göstər" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Gizlət" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/az/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/az/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/az/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/az/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/az/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/az/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Azerbaijani (http://www.transifex.com/projects/p/django/" "language/az/)\n" @@ -14,158 +14,161 @@ "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" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s uğurla silindi." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s silinmir" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Əminsiniz?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Seçilmiş %(verbose_name_plural)s-ləri sil" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Hamısı" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Hə" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Yox" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Bilinmir" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "İstənilən tarix" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Bu gün" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Son 7 gündə" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Bu ay" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Bu il" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Yenidən daxil olun, çünki seansın vaxtı bitmişdir." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Əməliyyat:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "əməliyyat vaxtı" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "obyekt id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "obyekt repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "bayraq" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "dəyişmə mesajı" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "loq yazısı" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "loq yazıları" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" əlavə olundu." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" - %(changes)s dəyişiklikləri qeydə alındı." -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" silindi." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry obyekti" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Heç nə" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s dəyişdi." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "və" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" əlavə olundu." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr " %(list)s %(name)s \"%(object)s\" üçün dəyişdi." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" siyahısından silindi." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Heç bir sahə dəyişmədi." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -173,38 +176,38 @@ "%(name)s \"%(obj)s\" siyahısına uğurla əlavə olundu. Yenə onu aşağıda " "redaktə edə bilərsiniz." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" siyahısına uğurla əlavə edildi." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" siyahısında uğurla dəyişdirildi." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -212,147 +215,137 @@ "Biz elementlər üzərində nəsə əməliyyat aparmaq üçün siz onları seçməlisiniz. " "Heç bir element dəyişmədi." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Heç bir əməliyyat seçilmədi." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s əlavə et" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" uğurla silindi." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r əsas açarı ilə %(name)s mövcud deyil." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s əlavə et" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s dəyiş" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Bazada xəta" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "%(count)s %(name)s uğurla dəyişdirildi." +msgstr[0] "" +msgstr[1] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" -msgstr[0] "%(total_count)s - hamısı seçilib" +msgstr[0] "" +msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s-dan 0 seçilib" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" uğurla silindi." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Dəyişmə tarixi: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Daxil ol" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django sayt administratoru" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administrasiya" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Sayt administrasiyası" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administrasiyası" - -#: widgets.py:90 -msgid "Date:" -msgstr "Tarix:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Vaxt:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Sorğu" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Yenisini əlavə et" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Daxil ol" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Səhifə tapılmadı" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Üzrlər, amma soruşduğunuz sayt tapılmadı." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Ev" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serverdə xəta" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serverdə xəta (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serverdə xəta (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -360,122 +353,143 @@ "Xəta baş verdi. Sayt administratorlarına e-poçt göndərildi və onlar xəta ilə " "tezliklə məşğul olacaqlar. Səbrli olun." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Seçdiyim əməliyyatı yerinə yetir" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Getdik" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Bütün səhifələr üzrə obyektləri seçmək üçün bura tıqlayın" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Bütün %(total_count)s sayda %(module_name)s seç" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Seçimi təmizlə" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Əvvəlcə istifadəçi adını və parolu daxil edin. Ondan sonra daha çox " +"istifadəçi imkanlarını redaktə edə biləcəksiniz." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "İstifadəçi adını və parolu daxil edin." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Parolu dəyiş" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" +"one: Aşağıdakı səhvi düzəltməyi xahiş edirik.\n" +"other: Aşağıdakı səhvləri düzəltməyi xahiş edirik." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s üçün yeni parol daxil edin." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Parol" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Parol (bir daha)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Yuxarıdakı parolu yenidən daxil edin, dəqiqləşdirmək üçün" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Xoş gördük," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Sənədləşdirmə" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Parolu dəyiş" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Çıx" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django sayt administratoru" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administrasiya" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Əlavə et" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Tarix" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Saytda göstər" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" -"one: Aşağıdakı səhvi düzəltməyi xahiş edirik.\n" -"other: Aşağıdakı səhvləri düzəltməyi xahiş edirik." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s əlavə et" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Süzgəc" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Sıralamadan çıxar" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sıralama prioriteti: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Sıralamanı çevir" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Sil" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -486,7 +500,7 @@ "obyektlər də silinməlidir. Ancaq sizin hesabın aşağıdakı tip obyektləri " "silməyə səlahiyyəti çatmır:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -495,7 +509,7 @@ "%(object_name)s \"%(escaped_object)s\" obyektini silmək üçün aşağıdakı " "qorunan obyektlər də silinməlidir:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -504,16 +518,16 @@ "%(object_name)s \"%(escaped_object)s\" obyektini silməkdə əminsiniz? Ona " "bağlı olan aşağıdakı obyektlər də silinəcək:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Hə, əminəm" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Bir neçə obyekt sil" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -524,7 +538,7 @@ "Ancaq sizin hesabınızın aşağıdakı tip obyektləri silmək səlahiyyətinə malik " "deyil:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -533,7 +547,7 @@ "%(objects_name)s obyektini silmək üçün aşağıdakı qorunan obyektlər də " "silinməlidir:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -542,41 +556,56 @@ "Seçdiyiniz %(objects_name)s obyektini silməkdə əminsiniz? Aşağıdakı bütün " "obyektlər və ona bağlı digər obyektlər də silinəcək:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Yığışdır" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Daha bir %(verbose_name)s əlavə et" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Silək?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s görə " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s proqramındakı modellər" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Dəyiş" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Üzrlər, amma sizin nəyisə dəyişməyə səlahiyyətiniz çatmır." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Son əməliyyatlar" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mənim etdiklərim" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Heç nə yoxdur" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Naməlum" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -585,27 +614,27 @@ "Bazanın qurulması ilə nəsə problem var. Lazımi cədvəllərin bazada " "yaradıldığını və uyğun istifadəçinin bazadan oxuya bildiyini yoxlayın." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Parol:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Parol və ya istifadəçi adını unutmusan?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Tarix/vaxt" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "İstifadəçi" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Əməliyyat" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -613,111 +642,61 @@ "Bu obyektin dəyişməsinə aid tarix mövcud deyil. Yəqin ki, o, bu admin saytı " "vasitəsilə yaradılmayıb." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Hamısını göstər" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Yadda saxla" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Axtar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" -msgstr[0] "%(counter)s nəticə" +msgstr[0] "" +msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "Hamısı birlikdə %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Yenisi kimi yadda saxla" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Yadda saxla və yenisini əlavə et" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Yadda saxla və redaktəyə davam et" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Əvvəlcə istifadəçi adını və parolu daxil edin. Ondan sonra daha çox " -"istifadəçi imkanlarını redaktə edə biləcəksiniz." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "İstifadəçi adını və parolu daxil edin." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s üçün yeni parol daxil edin." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Parol" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Parol (bir daha)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Yuxarıdakı parolu yenidən daxil edin, dəqiqləşdirmək üçün" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Yığışdır" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Daha bir %(verbose_name)s əlavə et" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Silək?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Sayt ilə səmərəli vaxt keçirdiyiniz üçün təşəkkür." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Yenidən daxil ol" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Parol dəyişmək" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Parol uğurla dəyişdi" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Sizin parolunuz dəyişdi." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -725,64 +704,48 @@ "Yoxlama üçün köhnə parolunuzu daxil edin. Sonra isə yeni parolu iki dəfə " "daxil edin ki, səhv etmədiyinizə əmin olaq." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Köhnə parol" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Yeni parol" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Mənim parolumu dəyiş" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Parolun sıfırlanması" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Parolun sıfırlanması başa çatdı" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Yeni parol artıq qüvvədədir. Yenidən daxil ola bilərsiniz." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Parolun sıfırlanması üçün təsdiq" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Yeni parolu daxil edin" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Yeni parolu iki dəfə daxil edin ki, səhv etmədiyinizə əmin olaq." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Yeni parol:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Yeni parol (bir daha):" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Parolun sıfırlanması baş tutmadı" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -790,24 +753,19 @@ "Parolun sıfırlanması üçün olan keçid, yəqin ki, artıq istifadə olunub. " "Parolu sıfırlamaq üçün yenə müraciət edin." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Parolun sıfırlanması uğurla başa çatdı." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -816,24 +774,24 @@ "%(site_name)s saytında parolu yeniləmək istədiyinizə görə bu məktubu " "göndərdik." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Növbəti səhifəyə keçid alın və yeni parolu seçin:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Sizin istifadəçi adınız:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Bizim saytdan istifadə etdiyiniz üçün təşəkkür edirik!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s komandası" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -841,28 +799,52 @@ "Parolu unutmusunuz? Aşağıda e-poçt ünvanınızı təqdim edin, biz isə yeni " "parol seçmək təlimatlarını sizə göndərək." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-poçt:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Parolumu sıfırla" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Bütün tarixlərdə" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Heç nə)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s seç" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s dəyişmək üçün seç" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Tarix:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Vaxt:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Sorğu" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Yenisini əlavə et" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/be/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,11 +3,11 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/django/" "language/be/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Даступныя %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -31,38 +31,38 @@ "Сьпіс даступных %s. Каб нешта абраць, пазначце патрэбнае ў полі ніжэй і " "пстрыкніце па стрэлцы «Абраць» між двума палямі." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Каб прасеяць даступныя %s, друкуйце ў гэтым полі." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Прасеяць" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Абраць усе" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Каб абраць усе %s, пстрыкніце тут." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Абраць" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Прыбраць" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Абралі %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -71,16 +71,17 @@ "Сьпіс абраных %s. Каб нешта прыбраць, пазначце патрэбнае ў полі ніжэй і " "пстрыкніце па стрэлцы «Прыбраць» між двума палямі." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Прыбраць усё" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Каб прыбраць усе %s, пстрыкніце тут." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Абралі %(sel)s з %(cnt)s" @@ -88,7 +89,8 @@ msgstr[2] "Абралі %(sel)s з %(cnt)s" msgstr[3] "Абралі %(sel)s з %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "У пэўных палях засталіся незахаваныя зьмены. Калі выканаць дзеяньне, " "незахаванае страціцца." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "Абралі дзеяньне, але не захавалі зьмены ў пэўных палях. Каб захаваць, " "націсьніце «Добра». Дзеяньне потым трэба будзе запусьціць нанова." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +118,90 @@ "Абралі дзеяньне, а ў палях нічога не зьмянялі. Мажліва, вы хацелі націснуць " "кнопку «Выканаць», а ня кнопку «Захаваць»." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Студзень Люты Сакавік Красавік Травень Чэрвень Ліпень Жнівень Верасень " -"Кастрычнік Лістапад Сьнежань" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Н П А С Ч П С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Паказаць" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Схаваць" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Цяпер" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Гадзіньнік" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Абярыце час" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Поўнач" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 папоўначы" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Поўдзень" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Скасаваць" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Сёньня" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Каляндар" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Учора" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Заўтра" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Студзень Люты Сакавік Красавік Травень Чэрвень Ліпень Жнівень Верасень " +"Кастрычнік Лістапад Сьнежань" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Н П А С Ч П С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Паказаць" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Схаваць" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/be/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/be/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/be/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/be/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/be/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Belarusian (http://www.transifex.com/projects/p/django/" "language/be/)\n" @@ -17,193 +17,196 @@ "Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Выдалілі %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Не ўдаецца выдаліць %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ці ўпэўненыя вы?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Выдаліць абраныя %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Усе" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Так" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Не" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Невядома" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Хоць-якая дата" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Сёньня" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Апошні тыдзень" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Гэты месяц" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Гэты год" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Тэрмін сэансу скончыўся, таму ўвайдзіце зноўку." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Дзеяньне:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "час дзеяньня" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "нумар аб’екта" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "прадстаўленьне аб’екта" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "від дзеяньня" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "паведамленьне пра зьмену" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "запіс у справаздачы" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "запісы ў справаздачы" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Дадалі «%(object)s»." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Зьмянілі «%(object)s» — %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Выдалілі «%(object)s»." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Запіс у справаздачы" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Няма" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Зьмянілі %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "і" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Дадалі %(name)s «%(object)s»." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Зьмянілі %(list)s для %(name)s «%(object)s»." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Выдалілі %(name)s «%(object)s»." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Палі не зьмяняліся." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "Дадалі %(name)s «%(obj)s». Ніжэй яго можна зноўку правіць." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Дадалі %(name)s «%(obj)s»." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Зьмянілі %(name)s «%(obj)s»." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -211,30 +214,35 @@ "Каб нешта рабіць, трэба спачатку абраць, з чым гэта рабіць. Нічога не " "зьмянілася." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Не абралі дзеяньняў." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Дадаць %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Сьцерлі %(name)s «%(obj)s»." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Аб’ект %(name)s з галоўным ключом %(key)r не існуе." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Дадаць %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Зьмяніць %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "База зьвестак дала хібу" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -243,7 +251,7 @@ msgstr[2] "Зьмянілі %(count)s %(name)s." msgstr[3] "Зьмянілі %(count)s %(name)s." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -252,231 +260,235 @@ msgstr[2] "Абралі ўсе %(total_count)s" msgstr[3] "Абралі ўсе %(total_count)s" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Абралі 0 аб’ектаў з %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Сьцерлі %(name)s «%(obj)s»." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Гісторыя зьменаў: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Увайсьці" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Кіраўнічая пляцоўка «Джэнґа»" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Кіраваць «Джэнґаю»" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Кіраваць пляцоўкаю" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Кіраваць %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Дата:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Час:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Шукаць" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Дадаць яшчэ" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Увайсьці" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Бачыну не знайшлі" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "На жаль, запытаную бачыну немагчыма знайсьці." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Пачатак" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Паслужнік даў хібу" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Паслужнік даў хібу (памылка 500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Паслужнік даў хібу (памылка 500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Выканаць абранае дзеяньне" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Выканаць" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Каб абраць аб’екты на ўсіх бачынах, націсьніце сюды" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Абраць усе %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Не абіраць нічога" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Спачатку пазначце імя карыстальніка ды пароль. Потым можна будзе наставіць " +"іншыя можнасьці." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Пазначце імя карыстальніка ды пароль." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Зьмяніць пароль" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Выпраўце хібы, апісаныя ніжэй." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Пазначце пароль для карыстальніка «%(username)s»." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Пароль" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Пароль (яшчэ раз)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Дзеля пэўнасьці набярыце такі самы пароль яшчэ раз." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Вітаем," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Дакумэнтацыя" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Зьмяніць пароль" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Выйсьці" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Кіраўнічая пляцоўка «Джэнґа»" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Кіраваць «Джэнґаю»" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Дадаць" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Гісторыя" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Зірнуць на пляцоўцы" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Выпраўце хібы, апісаныя ніжэй." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Дадаць %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Прасеяць" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Прыбраць з упарадкаванага" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Парадак: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Парадкаваць наадварот" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Выдаліць" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -486,7 +498,7 @@ "Калі выдаліць %(object_name)s «%(escaped_object)s», выдаляцца зьвязаныя " "аб’екты, але ваш рахунак ня мае дазволу выдаляць наступныя віды аб’ектаў:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -495,7 +507,7 @@ "Каб выдаліць %(object_name)s «%(escaped_object)s», трэба выдаліць і " "зьвязаныя абароненыя аб’екты:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -504,16 +516,16 @@ "Ці выдаліць %(object_name)s «%(escaped_object)s»? Усе наступныя зьвязаныя " "складнікі выдаляцца:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Так, дакладна" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Выдаліць некалькі аб’ектаў" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -523,7 +535,7 @@ "Калі выдаліць абранае (%(objects_name)s), выдаляцца зьвязаныя аб’екты, але " "ваш рахунак ня мае дазволу выдаляць наступныя віды аб’ектаў:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -532,7 +544,7 @@ "Каб выдаліць абранае (%(objects_name)s), трэба выдаліць і зьвязаныя " "абароненыя аб’екты:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -541,41 +553,56 @@ "Ці выдаліць абранае (%(objects_name)s)? Усе наступныя аб’екты ды зьвязаныя " "зь імі складнікі выдаляцца:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Прыбраць" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Дадаць яшчэ %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Ці выдаліць?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Зьмяніць" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Вы ня маеце дазволу нешта зьмяняць." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Нядаўнія дзеяньні" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Мае дзеяньні" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Недаступнае" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Невядомае зьмесьціва" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -584,27 +611,27 @@ "Нешта ня так з усталяванаю базаю зьвестак. Упэўніцеся, што ў базе стварылі " "патрэбныя табліцы, і што базу можа чытаць адпаведны карыстальнік." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Пароль:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Забыліся на імя ці пароль?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Час, дата" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Карыстальнік" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Дзеяньне" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -612,19 +639,20 @@ "Аб’ект ня мае гісторыі зьменаў. Мажліва, яго дадавалі не праз кіраўнічую " "пляцоўку." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Паказаць усё" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Захаваць" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Шукаць" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -633,93 +661,41 @@ msgstr[2] "%(counter)s вынікаў" msgstr[3] "%(counter)s вынікаў" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "Разам %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Захаваць як новы" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Захаваць і дадаць іншы" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Захаваць і працягваць правіць" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Спачатку пазначце імя карыстальніка ды пароль. Потым можна будзе наставіць " -"іншыя можнасьці." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Пазначце імя карыстальніка ды пароль." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Пазначце пароль для карыстальніка «%(username)s»." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Пароль" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Пароль (яшчэ раз)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Дзеля пэўнасьці набярыце такі самы пароль яшчэ раз." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Прыбраць" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Дадаць яшчэ %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Ці выдаліць?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Дзякуем за час, які вы сёньня правялі на гэтай пляцоўцы." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Увайсьці зноўку" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Зьмяніць пароль" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Пароль зьмянілі" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ваш пароль зьмяніўся." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -727,64 +703,48 @@ "Дзеля бясьпекі пазначце стары пароль, а потым набярыце новы пароль двойчы " "— каб упэўніцца, што набралі без памылак." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Стары пароль" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Новы пароль" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Зьмяніць пароль" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Узнавіць пароль" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Пароль узнавілі" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Вам усталявалі пароль. Можаце вярнуцца ды ўвайсьці зноўку." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Пацьвердзіце, што трэба ўзнавіць пароль" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Пазначце новы пароль" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Набярыце новы пароль двойчы — каб упэўніцца, што набралі без памылак." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Новы пароль:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Пацьвердзіце пароль:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Не ўдалося ўзнавіць пароль" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -792,75 +752,94 @@ "Спасылка ўзнавіць пароль хібная: мажліва таму, што ёю ўжо скарысталіся. " "Запытайцеся ўзнавіць пароль яшчэ раз." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Пароль узнавілі" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Перайдзіце да наступнае бачыны ды абярыце новы пароль:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Імя карыстальніка, калі раптам вы забыліся:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Дзякуем, што карыстаецеся нашаю пляцоўкаю!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Каманда «%(site_name)s»" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Узнавіць пароль" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Усе даты" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Нічога)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Абраць %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Абярыце %s, каб зьмяніць" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Дата:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Час:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Шукаць" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Дадаць яшчэ" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/bg/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/" "language/bg/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Налични %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "полето по-долу и след това кликнете върху \"Избор\" стрелка между двете " "кутии." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Въведете в това поле, за да филтрирате списъка на наличните %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Филтър" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Избери всички" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Кликнете, за да изберете всички %s наведнъж." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Избирам" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Премахни" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Избрахме %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "полето по-долу и след това щракнете върху \"Премахни\" стрелка между двете " "кутии." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Премахване на всички" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Кликнете, за да премахнете всички избрани %s наведнъж." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s на %(cnt)s е избран" msgstr[1] "%(sel)s на %(cnt)s са избрани" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "Имате незапазени промени по отделни полета за редактиране. Ако започнете " "друго, незаписаните промени ще бъдат загубени." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "Вие сте избрали действие, но не сте записали промените по полета. Моля, " "кликнете ОК, за да се запишат. Трябва отново да започнете действие." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +118,86 @@ "Вие сте избрали дадена дейност, а не сте направили някакви промени по " "полетата. Вероятно търсите Go бутон, а не бутона Save." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Януари Февруари Март Април Май Юни Юли Август Септември Октомври Ноември " -"Декември" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Н П В С Ч П С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Покажи" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Скрий" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Сега" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Часовник" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Избери време" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Полунощ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "По обяд" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Отказ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Днес" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Календар" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Вчера" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Утре" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Януари Февруари Март Април Май Юни Юли Август Септември Октомври Ноември " +"Декември" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Н П В С Ч П С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Покажи" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Скрий" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/bg/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/bg/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/bg/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/bg/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/bg/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,16 @@ # # Translators: # Boris Chervenkov , 2012 +# Claude Paroz , 2014 # Jannis Leidel , 2011 +# Lyuboslav Petrov , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 16:09+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Bulgarian (http://www.transifex.com/projects/p/django/" "language/bg/)\n" "MIME-Version: 1.0\n" @@ -18,156 +20,161 @@ "Language: bg\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно изтрити %(count)d %(items)s ." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Не можете да изтриете %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Сигурни ли сте?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Изтриване на избраните %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Всички" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Да" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Не" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Неизвестно" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Коя-да-е дата" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Днес" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Последните 7 дни" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Този месец" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Тази година" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"Моля въведете правилния %(username)s и парола за администраторски акаунт. " +"Моля забележете, че и двете полета са с главни и малки букви." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Моля, влезте отново, тъй като сесията е изтекла." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Действие:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "време на действие" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id на обекта" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr на обекта" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "флаг за действие" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "промени съобщение" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "записка" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "записки" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Добавен \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Променени \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Изтрит \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry обект" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Празно" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Променено %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "и" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Добавени %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Променени %(list)s за %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Изтрити %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Няма променени полета." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -175,38 +182,44 @@ "Обектът %(name)s \"%(obj)s\" бе успешно добавен. Може да го редактирате по-" "долу. " -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" +"%(name)s и \"%(obj)s\" са добавени успешно. Можете да добавите още едно " +"%(name)s по-долу." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Обектът %(name)s \"%(obj)s\" бе успешно добавен. " -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" +"%(name)s \"%(obj)s\" Бяха променени успешно. Можете да ги промените отново " +"по-долу." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" +"%(name)s \"%(obj)s\" бяха променени успешно. Можете да добавите ново " +"%(name)s по-долу." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Обектът %(name)s \"%(obj)s\" бе успешно актуализиран. " -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -214,149 +227,139 @@ "Елементите трябва да бъдат избрани, за да се извършат действия по тях. Няма " "променени елементи." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Няма избрани действия." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Добави %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Обектът %(name)s \"%(obj)s\" бе успешно изтрит. " -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s обект с първичен ключ %(key)r не съществува." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Добави %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Промени %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Грешка в базата данни" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s беше променено успешно." msgstr[1] "%(count)s %(name)s бяха променени успешно." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s е избран" msgstr[1] "Всички %(total_count)s са избрани" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 от %(cnt)s са избрани" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Обектът %(name)s \"%(obj)s\" бе успешно изтрит. " - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "История на промените: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Изтриването на избраните %(class_name)s %(instance)s ще наложи изтриването " +"на следните защитени и свързани обекти: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Вход" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Административен панел" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Административен панел" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Администрация на сайта" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s администрация" - -#: widgets.py:90 -msgid "Date:" -msgstr "Дата:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Час:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Търсене" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Добави друг" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Вход" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Страница не е намерена" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Съжалявам, но исканата страница не е намерена." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Начало" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Сървърна грешка" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Сървърна грешка (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Сървърна грешка (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -364,120 +367,141 @@ "Станала е грешка. Съобщава се на администраторите на сайта по електронна " "поща и трябва да бъде поправено скоро. Благодарим ви за търпението." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Стартирай избраните действия" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Търси" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Щракнете тук, за да изберете обектите във всички страници" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Избери всички %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Изтрий избраното" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Първо въведете потребител и парола. След това ще можете да редактирате " +"повече детайли. " + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Въведете потребителско име и парола." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Промени парола" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Моля, поправете грешките по-долу." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Моля поправете грешките по-долу." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Въведете нова парола за потребител %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Парола" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Парола (отново)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Въведете същата парола още веднъж за проверка. " + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Добре дошли," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документация" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Промени парола" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Изход" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Административен панел" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Административен панел" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Добави" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "История" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Разгледай в сайта" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Моля, поправете грешките по-долу." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Добави %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Филтър" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Премахни от подреждането" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Ред на подреждане: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Обърни подреждането" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Изтрий" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -488,7 +512,7 @@ "извършено без да се изтрият и някои свързани обекти, върху които обаче " "нямате права: " -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -497,7 +521,7 @@ "Изтриването на %(object_name)s '%(escaped_object)s' ще доведе до " "заличаването на следните защитени свързани обекти:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -506,16 +530,16 @@ "Наистина ли искате да изтриете обектите %(object_name)s \"%(escaped_object)s" "\"? Следните свързани елементи също ще бъдат изтрити:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Да, сигурен съм" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Изтриване на множество обекти" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -525,7 +549,7 @@ "Изтриването на избраните %(objects_name)s ще доведе до изтриване на свързани " "обекти. Вашият профил няма права за изтриване на следните типове обекти:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -534,7 +558,7 @@ "Изтриването на избраните %(objects_name)s ще доведе до заличаването на " "следните защитени свързани обекти:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -543,41 +567,56 @@ "Наистина ли искате да изтриете избраните %(objects_name)s? Всички изброени " "обекти и свързаните с тях ще бъдат изтрити:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Премахване" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Добави друг %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Изтриване?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " По %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Моделите в %(name)s приложение" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Промени" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Нямате права да редактирате каквото и да е." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Последни действия" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Моите действия" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Няма налични" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Неизвестно съдържание" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -586,27 +625,27 @@ "Проблем с базата данни. Проверете дали необходимите таблици са създадени и " "дали съответния потребител има необходимите права за достъп. " -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Парола:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Забравена парола или потребителско име?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Дата/час" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Потребител" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Действие" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -614,112 +653,61 @@ "Този обект няма исторя на промените. Вероятно не е добавен чрез " "административния панел. " -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Покажи всички" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Запис" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Търсене" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s резултат" msgstr[1] "%(counter)s резултати" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s общо" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Запис като нов" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Запис и нов" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Запис и продължение" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Първо въведете потребител и парола. След това ще можете да редактирате " -"повече детайли. " - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Въведете потребителско име и парола." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Въведете нова парола за потребител %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Парола" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Парола (отново)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Въведете същата парола още веднъж за проверка. " - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Премахване" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Добави друг %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Изтриване?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Благодарим Ви, че използвахте този сайт днес." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Влез пак" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Промяна на парола" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Паролата е сменена успешно" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Паролата ви е променена." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -727,46 +715,34 @@ "Въведете старата си парола /за сигурност/. След това въведете желаната нова " "парола два пъти от съображения за сигурност" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Стара парола" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Нова парола" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Промяна на парола" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Нова парола" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Промяната на парола завърши" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Паролата е променена. Вече можете да се впишете" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Парола за потвърждение" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Въведете нова парола" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -774,19 +750,15 @@ "Моля, въведете новата парола два пъти, за да може да се потвърди, че сте я " "написали правилно." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Нова парола:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Потвърдете паролата:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Неуспешна промяна на паролата " - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -794,24 +766,23 @@ "Връзката за възстановяване на паролата е невалидна, може би защото вече е " "използвана. Моля, поискайте нова промяна на паролата." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Паролата е успешно променена." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"Изпратихме Ви имейл за настройките по вашата парола. Би трябвало да ги " +"получите скоро." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Ако не получите имейл, моля подсигурете се, че сте въвели правилно адреса с " +"който сте се регистрирал/a и/или проверете спам папката във вашата поща." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -820,24 +791,24 @@ "Вие сте получили този имейл, защото сте поискали да промените паролата за " "вашия потребителски акаунт в %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Моля, отидете на следната страница и изберете нова парола:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Вашето потребителско име, в случай, че сте го забравили:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Благодарим, че ползвате сайта ни!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Екипът на %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -845,28 +816,52 @@ "Забравили сте си паролата? Въведете своя имейл адрес по-долу, а ние ще ви " "изпратим инструкции за създаване на нова." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-mail адреси:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Нова парола" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Всички дати" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Празен)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Изберете %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Изберете %s за промяна" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Дата:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Час:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Търсене" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Добави друг" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Сега:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Промени" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/bn/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/" "bn/)\n" "MIME-Version: 1.0\n" @@ -18,154 +18,174 @@ "Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s বিদ্যমান" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "ফিল্টার" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "সব বাছাই করুন" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "সব %s একবারে বাছাই করার জন্য ক্লিক করুন।" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "বাছাই করুন" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "মুছে ফেলুন" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s বাছাই করা হয়েছে" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "সব মুছে ফেলুন" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"জানুয়ারি ফেব্রুয়ারি মার্চ এপ্রিল মে জুন জুলাই অাগস্ট সেপ্টেম্বর অক্টোবর নভেম্বর ডিসেম্বর" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "র স ম ব ব শ শ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "দেখান" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "লুকান" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "এখন" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "ঘড়ি" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "সময় নির্বাচন করুন" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "মধ্যরাত" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "৬ পূর্বাহ্ন" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "দুপুর" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "বাতিল" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "আজ" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "দিনপঞ্জিকা" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "গতকাল" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "আগামীকাল" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"জানুয়ারি ফেব্রুয়ারি মার্চ এপ্রিল মে জুন জুলাই অাগস্ট সেপ্টেম্বর অক্টোবর নভেম্বর ডিসেম্বর" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "র স ম ব ব শ শ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "দেখান" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "লুকান" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/bn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/bn/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/bn/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/bn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/bn/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: -# anubhab91, 2013 +# Anubhab Baksi, 2013 # Jannis Leidel , 2011 # Tahmid Rafi , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Bengali (http://www.transifex.com/projects/p/django/language/" "bn/)\n" @@ -19,156 +19,159 @@ "Language: bn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d টি %(items)s সফলভাবে মুছে ফেলা হয়েছে" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s ডিলিট করা সম্ভব নয়" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "আপনি কি নিশ্চিত?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "চিহ্নিত অংশটি %(verbose_name_plural)s মুছে ফেলুন" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "সকল" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "হ্যাঁ" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "না" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "অজানা" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "যে কোন তারিখ" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "‍আজ" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "শেষ ৭ দিন" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "এ মাসে" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "এ বছরে" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "অনুগ্রহ করে পুনরায় প্রবেশ করুন, কেননা আপনার সেশনের মেয়াদ শেষ।" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "কাজ:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "কার্য সময়" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "অবজেক্ট আইডি" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "অবজেক্ট উপস্থাপক" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "কার্যচিহ্ন" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "বার্তা পরিবর্তন করুন" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "লগ এন্ট্রি" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "লগ এন্ট্রিসমূহ" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "%(object)s অ্যাড করা হয়েছে" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" ডিলিট করা হয়েছে" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "লগ-এন্ট্রি দ্রব্য" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "কিছু না" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s পরিবর্তিত হয়েছে।" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "এবং" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" যুক্ত হয়েছে।" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" এর জন্য %(list)s পরিবর্তিত হয়েছে।" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" মোছা হয়েছে।" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "কোন ফিল্ড পরিবর্তন হয়নি।" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,7 +179,7 @@ "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে। আপনি নিচে থেকে এটি পুনরায় সম্পাদন " "করতে পারেন।" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -185,298 +188,307 @@ "\"%(obj)s\" %(name)s টি সফলতার সাথে যোগ করা হয়েছে। আপনি চাইলে নিচ থেকে আরো " "একটি %(name)s যোগ করতে পারেন।" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" সফলতার সাথে যুক্ত হয়েছে।" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" সফলতার সাথে পরিবর্তিত হয়েছে।" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "কাজ করার আগে বস্তুগুলিকে অবশ্যই চিহ্নিত করতে হবে। কোনো বস্তু পরিবর্তিত হয়নি।" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "কোনো কাজ " -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s যোগ করুন" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" সফলতার সাথে মুছে ফেলা হয়েছে।" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r প্রাইমারি কি সম্বলিত %(name)s অবজেক্ট এর অস্তিত্ব নেই।" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s যোগ করুন" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s পরিবর্তন করুন" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "ডাটাবেস সমস্যা" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s টি থেকে ০ টি সিলেক্ট করা হয়েছে" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" সফলতার সাথে মুছে ফেলা হয়েছে।" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "ইতিহাস পরিবর্তনঃ %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "প্রবেশ করুন" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "জ্যাঙ্গো সাইট প্রশাসক" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "জ্যাঙ্গো প্রশাসন" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "সাইট প্রশাসন" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s প্রশাসন" - -#: widgets.py:90 -msgid "Date:" -msgstr "তারিখঃ" - -#: widgets.py:91 -msgid "Time:" -msgstr "সময়ঃ" - -#: widgets.py:165 -msgid "Lookup" -msgstr "খুঁজুন" - -#: widgets.py:260 -msgid "Add Another" -msgstr "আরেকটি যোগ করুন" - -#: widgets.py:302 -msgid "Currently:" -msgstr "বর্তমান অবস্থা:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "প্রবেশ করুন" -#: widgets.py:303 -msgid "Change:" -msgstr "পরিবর্তন:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "পৃষ্ঠা পাওয়া যায়নি" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "দুঃখিত, অনুরোধকৃত পাতাটি পাওয়া যায়নি।" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "নীড়পাতা" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "সার্ভার সমস্যা" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "সার্ভার সমস্যা (৫০০)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "সার্ভার সমস্যা (৫০০)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "চিহ্নিত কাজটি শুরু করুন" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "যান" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "সকল পৃষ্ঠার দ্রব্য পছন্দ করতে এখানে ক্লিক করুন" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "%(total_count)s টি %(module_name)s এর সবগুলোই সিলেক্ট করুন" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "চিহ্নিত অংশের চিহ্ন মুছে ফেলুন" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"প্রথমে একটি সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান। তারপরে আপনি ‍আরও সদস্য-অপশন যুক্ত করতে " +"পারবেন।" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "ইউজার নেইম এবং পাসওয়ার্ড টাইপ করুন।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "পাসওয়ার্ড বদলান" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "অনুগ্রহ করে নিচের ভুলগুলো সংশোধন করুন।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s সদস্যের জন্য নতুন পাসওয়ার্ড দিন।" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "পাসওয়ার্ড" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "পাসওয়ার্ড (পুনরায়)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "স্বাগতম," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "সহায়িকা" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "পাসওয়ার্ড বদলান" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "প্রস্থান" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "জ্যাঙ্গো সাইট প্রশাসক" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "জ্যাঙ্গো প্রশাসন" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "যোগ করুন" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "ইতিহাস" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "সাইটে দেখুন" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "অনুগ্রহ করে নিচের ভুলগুলো সংশোধন করুন।" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s যোগ করুন" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "ফিল্টার" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "ক্রমানুসারে সাজানো থেকে বিরত হোন" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "সাজানোর ক্রম: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "ক্রমানুসারে সাজানো চালু করুন/ বন্ধ করুন" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "মুছুন" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -486,14 +498,14 @@ "%(object_name)s '%(escaped_object)s' মুছে ফেললে এর সম্পর্কিত অবজেক্টগুলোও মুছে " "যাবে, কিন্তু আপনার নিম্নবর্ণিত অবজেক্টগুলো মোছার অধিকার নেইঃ" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -502,16 +514,16 @@ "আপনি কি %(object_name)s \"%(escaped_object)s\" মুছে ফেলার ব্যাপারে নিশ্চিত? " "নিম্নে বর্ণিত সকল আইটেম মুছে যাবেঃ" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "হ্যা়ঁ, আমি নিশ্চিত" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "একাধিক জিনিস মুছে ফেলুন" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -519,55 +531,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "মুছে ফেলুন" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "আরো একটি %(verbose_name)s যোগ করুন" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "মুছে ফেলুন?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s অনুযায়ী " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s এপ্লিকেশন এর মডেল গুলো" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "পরিবর্তন" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "কোন কিছু পরিবর্তনে আপনার অধিকার নেই।" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "সাম্প্রতিক কার্যাবলী" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "আমার কার্যাবলী" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "কিছুই পাওয়া যায়নি" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "অজানা বিষয়" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -576,138 +603,87 @@ "আপনার ডাটাবেস ইনস্টলে সমস্যা হয়েছে। নিশ্চিত করুন যে, ডাটাবেস টেবিলগুলো সঠিকভাবে " "তৈরী হয়েছে, এবং যথাযথ সদস্যের ডাটাবেস পড়ার অধিকার রয়েছে।" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "পাসওয়ার্ডঃ" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "ইউজার নেইম অথবা পাসওয়ার্ড ভুলে গেছেন?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "তারিখ/সময়" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "সদস্য" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "কার্য" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "এই অবজেক্টের কোন ইতিহাস নেই। সম্ভবত এটি প্রশাসন সাইট দিয়ে তৈরী করা হয়নি।" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "সব দেখান" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "সংরক্ষণ করুন" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "সার্চ" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "মোট %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "নতুনভাবে সংরক্ষণ করুন" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "সংরক্ষণ করুন এবং আরেকটি যোগ করুন" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "সংরক্ষণ করুন এবং সম্পাদনা চালিয়ে যান" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"প্রথমে একটি সদস্যনাম ও পাসওয়ার্ড প্রবেশ করান। তারপরে আপনি ‍আরও সদস্য-অপশন যুক্ত করতে " -"পারবেন।" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "ইউজার নেইম এবং পাসওয়ার্ড টাইপ করুন।" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s সদস্যের জন্য নতুন পাসওয়ার্ড দিন।" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "পাসওয়ার্ড" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "পাসওয়ার্ড (পুনরায়)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "উপরের পাসওয়ার্ডটি পুনরায় প্রবেশ করান, যাচাইয়ের জন্য।" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "মুছে ফেলুন" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "আরো একটি %(verbose_name)s যোগ করুন" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "মুছে ফেলুন?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ওয়েবসাইটে কিছু সময় কাটানোর জন্য আপনাকে আন্তরিক ধন্যবাদ।" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "পুনরায় প্রবেশ করুন" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "পাসওয়ার্ড বদলান" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "পাসওয়ার্ড বদল সফল হয়েছে" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "আপনার পাসওয়ার্ড বদলানো হয়েছে।" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -715,46 +691,34 @@ "অনুগ্রহ করে আপনার পুরনো পাসওয়ার্ড প্রবেশ করান, নিরাপত্তার কাতিরে, এবং পরপর দু’বার " "নতুন পাসওয়ার্ড প্রবেশ করান, যাচাই করার জন্য।" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "পুরনো পাসওয়ার্ড" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "নতুন পাসওয়ার্ড" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "আমার পাসওয়ার্ড পরিবর্তন করুন" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "পাসওয়ার্ড রিসেট করুন" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "পাসওয়ার্ড রিসেট সম্পন্ন হয়েছে" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "আপনার পাসওয়ার্ড দেয়া হয়েছে। আপনি এখন প্রবেশ (লগইন) করতে পারেন।" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "পাসওয়ার্ড রিসেট নিশ্চিত করুন" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "নতুন পাসওয়ার্ড দিন" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -762,19 +726,15 @@ "অনুগ্রহ করে আপনার পাসওয়ার্ড দুবার প্রবেশ করান, যাতে আমরা যাচাই করতে পারি আপনি " "সঠিকভাবে টাইপ করেছেন।" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "নতুন পাসওয়ার্ডঃ" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "পাসওয়ার্ড নিশ্চিতকরণঃ" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "পাসওয়ার্ড রিসেট সফল হয়নি" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -782,12 +742,7 @@ "পাসওয়ার্ড রিসেট লিঙ্কটি ঠিক নয়, হয়তো এটা ইতোমধ্যে ব্যবহৃত হয়েছে। পাসওয়ার্ড " "রিসেটের জন্য অনুগ্রহ করে নতুনভাবে আবেদন করুন।" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "পাসওয়ার্ড রিসেট সফল হয়েছে" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -795,13 +750,13 @@ "আমরা আপনার পাসওয়ার্ড সেট করার নিয়ম-কানুন আপনার দেয়া ইমেইল এড্রেসে পাঠিয়ে " "দিয়েছি। শীঘ্রই আপনি ইমেইলটি পাবেন।" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -810,24 +765,24 @@ "আপনি এই ই-মেইলটি পেয়েছেন কারন আপনি %(site_name)s এ আপনার ইউজার একাউন্টের " "পাসওয়ার্ড রিসেট এর জন্য অনুরোধ করেছেন।" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "অনুগ্রহ করে নিচের পাতাটিতে যান এবং নতুন পাসওয়ার্ড বাছাই করুনঃ" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "আপনার সদস্যনাম, যদি ভুলে গিয়ে থাকেনঃ" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "আমাদের সাইট ব্যবহারের জন্য ধন্যবাদ!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s দল" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -835,28 +790,52 @@ "পাসওয়ার্ড ভুলে গেছেন? নিচে আপনার ইমেইল এড্রেস দিন, এবং আমরা নতুন পাসওয়ার্ড সেট " "করার নিয়ম-কানুন আপনাকে ই-মেইল করব।" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "ইমেইল ঠিকানা:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "আমার পাসওয়ার্ড রিসেট করুন" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "সকল তারিখ" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(কিছুই না)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s বাছাই করুন" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s পরিবর্তনের জন্য বাছাই করুন" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "তারিখঃ" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "সময়ঃ" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "খুঁজুন" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "আরেকটি যোগ করুন" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "বর্তমান অবস্থা:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "পরিবর্তন:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/br/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Fulup , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Breton (http://www.transifex.com/projects/p/django/language/" "br/)\n" "MIME-Version: 1.0\n" @@ -17,154 +17,174 @@ "Language: br\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Hegerz %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Sil" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Dibab an holl" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klikañ evit dibab an holl %s war un dro." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Dibab" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Lemel kuit" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Dibabet %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Lemel kuit pep tra" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klikañ evit dilemel an holl %s dibabet war un dro." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Genver C'hwevrer Meurzh Ebrel Mae Mezheven Gouere Eost Gwengolo Here Du Kerzu" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S L M M Y G S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Diskouez" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Kuzhat" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Bremañ" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Horolaj" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Dibab un eur" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Hanternoz" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6e00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Kreisteiz" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Nullañ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hiziv" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Deiziadur" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Dec'h" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Warc'hoazh" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Genver C'hwevrer Meurzh Ebrel Mae Mezheven Gouere Eost Gwengolo Here Du Kerzu" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S L M M Y G S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Diskouez" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Kuzhat" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/br/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/br/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/br/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/br/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/br/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Breton (http://www.transifex.com/projects/p/django/language/" "br/)\n" @@ -17,460 +17,470 @@ "Language: br\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ha sur oc'h ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "An holl" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ya" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ket" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Dianav" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Forzh pegoulz" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hiziv" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Er 7 devezh diwezhañ" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ar miz-mañ" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ar bloaz-mañ" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ober :" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "eur an ober" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "Kemennadenn gemmañ" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Traezenn eus ar marilh" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Hini ebet" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Kemmet %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ha" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "N'eus bet kemmet maezienn ebet." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Ouzhpennañ %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Ouzhpennañ %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Kemmañ %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Fazi en diaz roadennoù" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Istor ar c'hemmoù : %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Kevreañ" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Lec'hienn verañ Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Merañ Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Merañ al lec'hienn" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Merañ %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Deiziad :" - -#: widgets.py:91 -msgid "Time:" -msgstr "Eur :" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Klask" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Ouzhpennañ unan all" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Kevreañ" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "N'eo ket bet kavet ar bajenn" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Degemer" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Fazi servijer" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Fazi servijer (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Fazi servijer (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Mont" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Riñsañ an diuzadenn" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Merkit un anv implijer hag ur ger-tremen." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cheñch ger-tremen" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Ger-tremen" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Ger-tremen (adarre)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Degemer mat," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Teulioù" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cheñch ger-tremen" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Digevreañ" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Lec'hienn verañ Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Merañ Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Ouzhpennañ" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Istor" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Gwelet war al lec'hienn" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Ouzhpennañ %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Sil" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Eilpennañ an diuzadenn" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Diverkañ" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -478,30 +488,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ya, sur on" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -509,328 +519,297 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Lemel kuit" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Diverkañ ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " dre %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Kemmañ" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Ma oberoù" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Endalc'had dianav" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Ger-tremen :" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Disoñjet ho ker-tremen pe hoc'h anv implijer ganeoc'h ?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Deiziad/eur" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Implijer" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ober" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Diskouez pep tra" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Enrollañ" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Klask" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Enrollañ evel nevez" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Enrollañ hag ouzhpennañ unan all" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Enrollañ ha derc'hel da gemmañ" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Merkit un anv implijer hag ur ger-tremen." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Ger-tremen" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Ger-tremen (adarre)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Lemel kuit" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Diverkañ ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Kevreañ en-dro" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cheñch ho ker-tremen" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Ger-termen cheñchet ervat" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Cheñchet eo bet ho ker-tremen." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Ger-tremen kozh" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Ger-tremen nevez" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Cheñch ma ger-tremen" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Adderaouekaat ar ger-tremen" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Adderaouekaet eo bet ar ger-tremen ervat" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Kadarnaat eo bet cheñchet ar ger-tremen" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Merkañ ur ger-tremen nevez" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Ger-tremen nevez :" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Kadarnaat ar ger-tremen :" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Ur fazi zo c'hoarvezet en ur cheñch ger-tremen" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Cheñchet eo bet ar ger-tremen ervat" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Ho trugarekaat da ober gant hol lec'hienn !" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "An holl zeiziadoù" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(hini)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Diuzañ %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Deiziad :" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Eur :" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Klask" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Ouzhpennañ unan all" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/bs/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Filip Dupanović , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/" "bs/)\n" "MIME-Version: 1.0\n" @@ -18,73 +18,75 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Dostupno %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Odaberi sve" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Ukloni" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Odabrani %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Izabran %(sel)s od %(cnt)s" msgstr[1] "Izabrano %(sel)s od %(cnt)s" msgstr[2] "Izabrano %(sel)s od %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -92,82 +94,102 @@ "Imate nespašene izmjene na pojedinim uređenim poljima. Ako pokrenete ovu " "akciju, te izmjene će biti izgubljene." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Danas" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/bs/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/bs/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/bs/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/bs/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Bosnian (http://www.transifex.com/projects/p/django/language/" "bs/)\n" @@ -19,156 +19,159 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspješno izbrisano %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izbriši odabrane %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Svi" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Da" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nepoznato" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Svi datumi" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Danas" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Poslednjih 7 dana" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ovaj mesec" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ova godina" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Molimo da se prijavite ponovo, pošto je vaša sesija istekla." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Radnja:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "vrijeme radnje" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id objekta" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr objekta" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "oznaka radnje" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "opis izmjene" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "zapis u logovima" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "zapisi u logovima" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nijedan" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Promijenjeno %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "i" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodano %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Promijeni %(list)s za %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Izbrisani %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nije bilo izmjena polja." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,38 +179,38 @@ "Objekat „%(obj)s“ klase %(name)s dodat je uspješno. Dole možete unjeti " "dodatne izmjene." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspješno." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Objekat „%(obj)s“ klase %(name)s izmjenjen je uspješno." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -215,30 +218,35 @@ "Predmeti moraju biti izabrani da bi se mogla obaviti akcija nad njima. " "Nijedan predmet nije bio izmjenjen." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nijedna akcija nije izabrana." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Dodaj objekat klase %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Objekat „%(obj)s“ klase %(name)s obrisan je uspješno." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekat klase %(name)s sa primarnim ključem %(key)r ne postoji." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Dodaj objekat klase %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Izmjeni objekat klase %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Greška u bazi podataka" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -246,7 +254,7 @@ msgstr[1] "" msgstr[2] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -254,231 +262,235 @@ msgstr[1] "" msgstr[2] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s izabrani" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Objekat „%(obj)s“ klase %(name)s obrisan je uspješno." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historijat izmjena: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Prijava" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administracija sajta" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administracija" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administracija sistema" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administracija %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Vrijeme:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Pretraži" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Dodaj još jedan" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Prijava" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Stranica nije pronađena" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Žao nam je, tražena stranica nije pronađena." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Početna" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Greška na serveru" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Greška na serveru (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Greška na serveru (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Pokreni odabranu radnju" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Počni" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kliknite ovdje da izaberete objekte preko svih stranica" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Izaberite svih %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Izbrišite izbor" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Prvo unesite korisničko ime i lozinku. Potom ćete moći da mijenjate još " +"korisničkih podešavanja." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Promjena lozinke" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Unesite novu lozinku za korisnika %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Lozinka" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Lozinka (ponovite)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Radi provjere tačnosti ponovo unesite lozinku koju ste unijeli gore." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Dobrodošli," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentacija" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Promjena lozinke" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Odjava" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administracija sajta" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administracija" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Dodaj" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historijat" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Pregled na sajtu" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Dodaj objekat klase %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Obriši" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -489,14 +501,14 @@ "objekata koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za " "brisanje slijedećih tipova objekata:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -506,16 +518,16 @@ "„%(escaped_object)s“? Slijedeći objekti koji su u vezi sa ovim objektom će " "također biti obrisani:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Da, siguran sam" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Brisanje više objekata" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -523,55 +535,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Obriši" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Dodaj još jedan %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Brisanje?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Izmjeni" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nemate dozvole da unosite bilo kakve izmjene." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Posjlednje radnje" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Moje radnje" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nema podataka" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Nepoznat sadržaj" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -580,27 +607,27 @@ "Nešto nije uredu sa vašom bazom podataka. Provjerite da li postoje " "odgovarajuće tabele i da li odgovarajući korisnik ima pristup bazi." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Lozinka:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/vrijeme" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Korisnik" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Radnja" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -608,19 +635,20 @@ "Ovaj objekat nema zabilježen historijat izmjena. Vjerovatno nije dodan kroz " "ovaj sajt za administraciju." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Prikaži sve" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Sačuvaj" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Pretraga" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -628,93 +656,41 @@ msgstr[1] "" msgstr[2] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "ukupno %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Sačuvaj kao novi" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Sačuvaj i dodaj slijedeći" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Sačuvaj i nastavi sa izmjenama" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Prvo unesite korisničko ime i lozinku. Potom ćete moći da mijenjate još " -"korisničkih podešavanja." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Unesite novu lozinku za korisnika %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Lozinka" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Lozinka (ponovite)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Radi provjere tačnosti ponovo unesite lozinku koju ste unijeli gore." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Obriši" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Dodaj još jedan %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Brisanje?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Hvala što ste danas proveli vrijeme na ovom sajtu." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Ponovna prijava" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Izmjena lozinke" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "uspješna izmjena lozinke" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Vaša lozinka je izmjenjena." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -722,46 +698,34 @@ "Iz bezbjednosnih razloga prvo unesite svoju staru lozinku, a novu zatim " "unesite dva puta da bismo mogli da provjerimo da li ste je pravilno unijeli." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Stara lozinka" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nova lozinka" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Izmijeni moju lozinku" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Resetovanje lozinke" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Resetovanje lozinke uspješno" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Vaša lozinka je postavljena. Možete se prijaviti." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potvrda resetovanja lozinke" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Unesite novu lozinku" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -769,19 +733,15 @@ "Unesite novu lozinku dva puta kako bismo mogli da provjerimo da li ste je " "pravilno unijeli." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nova lozinka:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potvrda lozinke:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Resetovanje lozinke neuspješno" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -789,75 +749,94 @@ "Link za resetovanje lozinke nije važeći, vjerovatno zato što je već " "iskorišćen. Ponovo zatražite resetovanje lozinke." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Resetovanje lozinke uspješno." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Idite na slijedeću stranicu i postavite novu lozinku." -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Ukoliko ste zaboravili, vaše korisničko ime:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Hvala što koristite naš sajt!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Uredništvo sajta %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Resetuj moju lozinku" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Svi datumi" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Odaberi objekat klase %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Odaberi objekat klase %s za izmjenu" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Vrijeme:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Pretraži" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Dodaj još jedan" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ca/LC_MESSAGES/djangojs.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: -# 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-16 10:47+0000\n" +"Last-Translator: Carles Barrobés \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s Disponibles" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "seleccionant-los a la caixa de sota i fent clic a la fletxa \"Escollir\" " "entre les dues caixes." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Escriviu en aquesta caixa per a filtrar la llista de %s disponibles." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtre" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Escollir-los tots" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Feu clic per escollir tots els %s d'un cop." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Escollir" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Eliminar" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Escollit %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,22 +74,24 @@ "los a la caixa de sota i fent clic a la fletxa \"Eliminar\" entre les dues " "caixes." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Esborrar-los tots" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Feu clic per eliminar tots els %s escollits d'un cop." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s seleccionat" msgstr[1] "%(sel)s of %(cnt)s seleccionats" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -97,7 +99,8 @@ "Teniu canvis sense desar a camps editables individuals. Si executeu una " "acció, es perdran aquests canvis no desats." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -107,7 +110,8 @@ "camps individuals. Si us plau premeu OK per desar. Haureu de tornar a " "executar l'acció." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,70 +120,86 @@ "Heu seleccionat una acció i no heu fet cap canvi a camps individuals. " "Probablement esteu cercant el botó 'Anar' enlloc de 'Desar'." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Gener Febrer Març Abril Maig Juny Juliol Agost Setembre Octubre Novembre " -"Desembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "dg dl dt dc dj dv ds" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ocultar" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Nota: Aneu %s hora avançats respecte la hora del servidor." +msgstr[1] "Nota: Aneu %s hores avançats respecte la hora del servidor." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Nota: Aneu %s hora endarrerits respecte la hora del servidor." +msgstr[1] "Nota: Aneu %s hores endarrerits respecte la hora del servidor." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Ara" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Rellotge" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Escolliu una hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Mitjanit" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Migdia" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancel·lar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Avui" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendari" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ahir" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Demà" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Gener Febrer Març Abril Maig Juny Juliol Agost Setembre Octubre Novembre " +"Desembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "dg dl dt dc dj dv ds" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ocultar" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ca/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ca/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ca/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ca/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ca/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Carles Barrobés , 2011-2012 +# Antoni Aloy , 2014 +# 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-18 19:44+0000\n" +"Last-Translator: Antoni Aloy \n" "Language-Team: Catalan (http://www.transifex.com/projects/p/django/language/" "ca/)\n" "MIME-Version: 1.0\n" @@ -18,62 +19,68 @@ "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Eliminat/s %(count)d %(items)s satisfactòriament." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "No es pot esborrar %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "N'esteu segur?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar els %(verbose_name_plural)s seleccionats" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administració" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Tots" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sí" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Desconegut" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Qualsevol data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Avui" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últims 7 dies" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Aquest mes" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Aquest any" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -82,115 +89,112 @@ "Si us plau, introduïu un %(username)s i clau correcta per un compte de " "personal. Observeu que ambdós camps són sensibles a majúscules." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Si us plau, entreu de nou perquè la vostra sessió ha caducat." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Acció:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "moment de l'acció" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id de l'objecte" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "'repr' de l'objecte" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "indicador de l'acció" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "missatge del canvi" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada del registre" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entrades del registre" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Afegit \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Modificat \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Eliminat \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objecte entrada del registre" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "cap" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modificat %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "i" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Afegit %(name)s \"%(object)s\"" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificat %(list)s per a %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eliminat %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Cap camp modificat." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "S'ha afegit amb èxit el/la %(name)s \"%(obj)s\". Pot editar-lo de nou a sota." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -"El %(name)s \"%(obj)s fou afegit satisfactòriament. Pos afegir un altre " +"El %(name)s \"%(obj)s fou afegit satisfactòriament. Pot afegir un altre " "%(name)s a continuació." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "El/la %(name)s \"%(obj)s\" ha estat afegit/da amb èxit." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -199,21 +203,21 @@ "El %(name)s \"%(obj)s\" fou canviat satisfactòriament. Pot editar-lo un " "altra vegada a continuació." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -"El %(name)s \"%(obj)s\" fou canviat satisfactòriament. Pots afegir un altre " +"El %(name)s \"%(obj)s\" fou canviat satisfactòriament. Pot afegir un altre " "%(name)s a continuació." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "S'ha modificat amb èxit el/la %(name)s \"%(obj)s." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -221,149 +225,139 @@ "Heu de seleccionar els elements per poder realitzar-hi accions. No heu " "seleccionat cap element." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "no heu seleccionat cap acció" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Afegir %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existeix cap objecte %(name)s amb la clau primària %(key)r." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Afegir %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Error de base de dades" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s s'ha modificat amb èxit." msgstr[1] "%(count)s %(name)s s'han modificat amb èxit." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionat(s)" msgstr[1] "Tots %(total_count)s seleccionat(s)" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionats" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "El/la %(name)s \"%(obj)s\" s'ha eliminat amb èxit." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Modificar històric: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Esborrar %(class_name)s %(instance)s requeriria esborrar els següents " +"objectes relacionats protegits: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Iniciar sessió" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Lloc administratiu de Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administració de Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administració del lloc" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administració de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Cercar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Afegir-ne un altre" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Actualment:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Iniciar sessió" -#: widgets.py:303 -msgid "Change:" -msgstr "Canviar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Administració de %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "No s'ha pogut trobar la pàgina" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Ho sentim, però no s'ha pogut trobar la pàgina sol·licitada" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Inici" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Error del servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Error del servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Error del servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -372,120 +366,141 @@ "correu electrònic, i hauria d'arreglar-se en breu. Gràcies per la vostra " "paciència." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Executar l'acció seleccionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Anar" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Feu clic aquí per seleccionar els objectes a totes les pàgines" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seleccioneu tots %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Netejar la selecció" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primer, entreu un nom d'usuari i una contrasenya. Després podreu editar més " +"opcions de l'usuari." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Introduïu un nom d'usuari i contrasenya." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Canviar contrasenya" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Si us plau, corregiu els errors mostrats a sota." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Si us plau, corregiu els errors mostrats a sota." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Introduïu una contrasenya per l'usuari %(username)s" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Contrasenya" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Contrasenya (de nou)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Benvingut/da," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentació" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Canviar contrasenya" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Finalitzar sessió" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Lloc administratiu de Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administració de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Afegir" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Històric" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Veure al lloc" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Si us plau, corregiu els errors mostrats a sota." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Afegir %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtre" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Treure de la ordenació" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritat d'ordenació: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Commutar ordenació" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -496,7 +511,7 @@ "d'objectes relacionats, però el vostre compte no te permisos per esborrar " "els tipus d'objecte següents:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -505,7 +520,7 @@ "Esborrar %(object_name)s '%(escaped_object)s' requeriria esborrar els " "següents objectes relacionats protegits:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -514,16 +529,16 @@ "Esteu segurs de voler esborrar els/les %(object_name)s \"%(escaped_object)s" "\"? S'esborraran els següents elements relacionats:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sí, n'estic segur" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Eliminar múltiples objectes" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -534,7 +549,7 @@ "relacionats, però el vostre compte no té permisos per esborrar els següents " "tipus d'objectes:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -543,7 +558,7 @@ "Esborrar els %(objects_name)s seleccionats requeriria esborrar els següents " "objectes relacionats protegits:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -552,41 +567,56 @@ "N'esteu segur de voler esborrar els %(objects_name)s seleccionats? " "S'esborraran tots els objects següents i els seus elements relacionats:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Afegir un/a altre/a %(verbose_name)s." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Eliminar?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Per %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Models en l'aplicació %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "No teniu permís per editar res." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Accions recents" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Les meves accions" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Cap disponible" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contingut desconegut" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -596,27 +626,27 @@ "vos que s'han creat les taules adients, i que la base de dades és llegible " "per l'usuari apropiat." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Contrasenya:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Heu oblidat la vostra contrasenya o nom d'usuari?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usuari" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Acció" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -624,112 +654,61 @@ "Aquest objecte no té historial de canvis. Probablement no es va afegir " "utilitzant aquest lloc administratiu." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostrar tots" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Desar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Cerca" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultat" msgstr[1] "%(counter)s resultats" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s en total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Desar com a nou" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Desar i afegir-ne un de nou" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Desar i continuar editant" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primer, entreu un nom d'usuari i una contrasenya. Després podreu editar més " -"opcions de l'usuari." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Introduïu un nom d'usuari i contrasenya." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Introduïu una contrasenya per l'usuari %(username)s" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Contrasenya" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Contrasenya (de nou)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Introduïu la mateixa contrasenya de dalt, per fer-ne la verificació." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Eliminar" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Afegir un/a altre/a %(verbose_name)s." - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Eliminar?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Gràcies per passar una estona de qualitat al web durant el dia d'avui." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Iniciar sessió de nou" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Canvi de contrasenya" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Contrasenya canviada amb èxit" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "La seva contrasenya ha estat canviada." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -738,47 +717,35 @@ "seguit introduïu la vostra contrasenya nova dues vegades per verificar que " "l'heu escrita correctament." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Contrasenya antiga" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Contrasenya nova" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Canviar la meva contrasenya:" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Restablir contrasenya" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Contrasenya restablerta" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "S'ha canviat la vostra contrasenya. Ara podeu continuar i iniciar sessió." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmació de restabliment de contrasenya" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Introduïu la nova contrasenya" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -786,19 +753,15 @@ "Si us plau, introduïu la vostra nova contrasenya dues vegades, per verificar " "que l'heu escrita correctament." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Contrasenya nova:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirmar contrasenya:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Restabliment de contrasenya fallat" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -806,24 +769,23 @@ "L'enllaç de restabliment de contrasenya era invàlid, potser perquè ja s'ha " "utilitzat. Si us plau, sol·liciteu un nou reestabliment de contrasenya." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Restabliment de contrasenya amb èxit" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"Us hem enviat instruccions per configurar la vostra contrasenya. Les hauríeu " +"de rebre en breu." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Si no rebeu un correu, assegureu-vos que heu introduït l'adreça amb la que " +"us vau registrar, i comproveu la vostra carpeta de \"spam\"." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -832,24 +794,24 @@ "Heu rebut aquest correu perquè vau sol·licitar restablir la contrasenya per " "al vostre compte d'usuari a %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Si us plau, aneu a la pàgina següent i escolliu una nova contrasenya:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "El vostre nom d'usuari, en cas que l'hagueu oblidat:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Gràcies per fer ús del nostre lloc!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "L'equip de %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -857,28 +819,52 @@ "Heu oblidat la vostra contrasenya? Introduïu la vostra adreça de correu " "electrònic a sota, i us enviarem instruccions per canviar-la." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Adreça de correu electrònic:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Restablir la meva contrasenya" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Totes les dates" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Cap)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Seleccioneu %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Seleccioneu %s per modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Cercar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Afegir-ne un altre" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Actualment:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Canviar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/cs/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,14 @@ # Translators: # Jannis Leidel , 2011 # Jirka Vejrazka , 2011 -# Vlada Macek , 2012 +# 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-23 09:13+0000\n" +"Last-Translator: Vlada Macek \n" "Language-Team: Czech (http://www.transifex.com/projects/p/django/language/" "cs/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Dostupné položky: %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,40 +33,40 @@ "Seznam dostupných položek %s. Jednotlivě je lze vybrat tak, že na ně v " "rámečku klepnete a pak klepnete na šipku \"Vybrat\" mezi rámečky." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" "Chcete-li filtrovat ze seznamu dostupných položek %s, začněte psát do tohoto " "pole." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtr" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Vybrat vše" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Chcete-li najednou vybrat všechny položky %s, klepněte sem." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Vybrat" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Odebrat" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Vybrané položky %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,23 +75,25 @@ "Seznam vybraných položek %s. Jednotlivě je lze odebrat tak, že na ně v " "rámečku klepnete a pak klepnete na šipku \"Odebrat mezi rámečky." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Odebrat vše" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Chcete-li najednou odebrat všechny vybrané položky %s, klepněte sem." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Vybrána je %(sel)s položka z celkem %(cnt)s." msgstr[1] "Vybrány jsou %(sel)s položky z celkem %(cnt)s." msgstr[2] "Vybraných je %(sel)s položek z celkem %(cnt)s." -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +101,8 @@ "V jednotlivých polích jsou neuložené změny, které budou ztraceny, pokud " "operaci provedete." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "Byla vybrána operace, ale dosud nedošlo k uložení změn jednotlivých polí. " "Uložíte klepnutím na tlačítko OK. Pak bude třeba operaci spustit znovu." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +121,88 @@ "Byla vybrána operace a jednotlivá pole nejsou změněná. Patrně hledáte " "tlačítko Provést spíše než Uložit." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"leden únor březen duben květen červen červenec srpen září říjen listopad " -"prosinec" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "n p ú s č p s" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Zobrazit" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Skrýt" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Poznámka: Váš čas o %s hodinu předstihuje čas na serveru." +msgstr[1] "Poznámka: Váš čas o %s hodiny předstihuje čas na serveru." +msgstr[2] "Poznámka: Váš čas o %s hodin předstihuje čas na serveru." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Poznámka: Váš čas se o %s hodinu zpožďuje za časem na serveru." +msgstr[1] "Poznámka: Váš čas se o %s hodiny zpožďuje za časem na serveru." +msgstr[2] "Poznámka: Váš čas se o %s hodin zpožďuje za časem na serveru." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nyní" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Hodiny" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Vyberte čas" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Půlnoc" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6h ráno" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Poledne" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Storno" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Dnes" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendář" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Včera" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Zítra" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"leden únor březen duben květen červen červenec srpen září říjen listopad " +"prosinec" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "n p ú s č p s" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Zobrazit" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Skrýt" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/cs/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/cs/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/cs/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/cs/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/cs/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,13 +3,13 @@ # Translators: # Jannis Leidel , 2011 # Jirka Vejrazka , 2011 -# Vlada Macek , 2013 +# Vlada Macek , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 13:32+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-22 17:44+0000\n" "Last-Translator: Vlada Macek \n" "Language-Team: Czech (http://www.transifex.com/projects/p/django/language/" "cs/)\n" @@ -19,62 +19,68 @@ "Language: cs\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Úspěšně odstraněno: %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Nelze smazat %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Jste si jisti?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Odstranit vybrané položky typu %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Správa" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Vše" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ano" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Neznámé" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Libovolné datum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Dnes" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Posledních 7 dní" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Tento měsíc" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Tento rok" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,94 +89,91 @@ "Zadejte správné %(username)s a heslo pro personál. Obě pole mohou rozlišovat " "velká a malá písmena." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Přihlaste se znovu, vaše sezení vypršelo." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Operace:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "čas operace" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id položky" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "reprez. položky" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "příznak operace" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "zpráva o změně" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "položka protokolu" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "položky protokolu" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Přidán objekt \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Změněn objekt \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Odstraněn objekt \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objekt záznam v protokolu" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Žádný" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Změněno: %s" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "a" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Položka \"%(object)s\" typu %(name)s byla přidána." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Změna polí: %(list)s pro položku \"%(object)s\" typu %(name)s." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Položka \"%(object)s\" typu %(name)s byla odstraněna." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nebyla změněna žádná pole." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -178,7 +181,7 @@ "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána. Níže můžete v " "úpravách pokračovat." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +190,12 @@ "Objekt \"%(obj)s\" typu %(name)s byl úspěšně přidán. Níže můžete přidat " "další %(name)s." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně přidána." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ "Objekt \"%(obj)s\" typu %(name)s byl úspěšně změněn. Níže ho můžete znovu " "upravovat." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "Objekt \"%(obj)s\" typu %(name)s byl úspěšně změněn. Níže můžete přidat " "další %(name)s." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně změněna." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,30 +226,35 @@ "K provedení hromadných operací je třeba vybrat nějaké položky. Nedošlo k " "žádným změnám." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nebyla vybrána žádná operace." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s: přidat" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně odstraněna." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Položka \"%(name)s\" s primárním klíčem \"%(key)r\" neexistuje." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s: přidat" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s: změnit" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Chyba databáze" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -254,7 +262,7 @@ msgstr[1] "%(count)s položky %(name)s byly úspěšně změněny." msgstr[2] "%(count)s položek %(name)s bylo úspěšně změněno." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -262,29 +270,24 @@ msgstr[1] "Všechny %(total_count)s položky vybrány." msgstr[2] "Vybráno všech %(total_count)s položek." -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Vybraných je 0 položek z celkem %(cnt)s." -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Položka \"%(obj)s\" typu %(name)s byla úspěšně odstraněna." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historie změn: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s: %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -293,83 +296,71 @@ "Odstranění položky \"%(instance)s\" typu %(class_name)s by vyžadovalo " "odstranění těchto souvisejících chráněných položek: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Přihlášení" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Správa webu Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Správa systému Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Správa webu" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Správa aplikace %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Čas:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Hledat" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Přidat další" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Aktuálně:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Přihlášení" -#: widgets.py:303 -msgid "Change:" -msgstr "Změna:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Správa aplikace %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Stránka nenalezena" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Požadovaná stránka nebyla bohužel nalezena." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Domů" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Chyba serveru" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Chyba serveru (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Chyba serveru (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -377,120 +368,141 @@ "V systému došlo k chybě. Byla e-mailem nahlášena správcům, kteří by ji měli " "v krátké době opravit. Děkujeme za trpělivost." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Provést vybranou operaci" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Provést" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klepnutím zde vyberete položky ze všech stránek." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Vybrat všechny položky typu %(module_name)s, celkem %(total_count)s." -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Zrušit výběr" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Nejdříve vložte uživatelské jméno a heslo. Poté budete moci upravovat více " +"uživatelských nastavení." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Vložte uživatelské jméno a heslo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Změnit heslo" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Opravte níže uvedené chyby." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Opravte níže uvedené chyby." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Vložte nové heslo pro uživatele %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Heslo" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Heslo (znovu)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Pro ověření vložte stejné heslo znovu." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Vítejte, uživateli" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentace" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Změnit heslo" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Odhlásit se" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Správa webu Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Správa systému Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Přidat" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historie" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Zobrazení na webu" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Opravte níže uvedené chyby." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Opravte níže uvedené chyby." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s: přidat" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtr" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Přestat řadit" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Priorita řazení: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Přehodit řazení" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Odstranit" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -501,7 +513,7 @@ "odstranění souvisejících položek. Nemáte však oprávnění k odstranění položek " "následujících typů:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -510,7 +522,7 @@ "Odstranění položky '%(escaped_object)s' typu %(object_name)s by vyžadovalo " "odstranění souvisejících chráněných položek:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -519,16 +531,16 @@ "Opravdu má být odstraněna položka \"%(escaped_object)s\" typu " "%(object_name)s? Následující související položky budou všechny odstraněny:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ano, jsem si jist(a)" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Odstranit vybrané položky" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -539,7 +551,7 @@ "souvisejících položek. Nemáte však oprávnění k odstranění položek " "následujících typů:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -548,7 +560,7 @@ "Odstranění vybrané položky typu %(objects_name)s by vyžadovalo odstranění " "následujících souvisejících chráněných položek:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -557,41 +569,56 @@ "Opravdu má být odstraněny vybrané položky typu %(objects_name)s? Všechny " "vybrané a s nimi související položky budou odstraněny:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Odebrat" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Přidat %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Odstranit?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Dle: %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modely v aplikaci %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Změnit" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nemáte oprávnění nic měnit." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Poslední operace" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Vaše operace" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nic" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Neznámý obsah" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -601,27 +628,27 @@ "odpovídající tabulky a že databáze je přístupná pro čtení příslušným " "uživatelem." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Heslo:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Zapomněli jste heslo nebo uživatelské jméno?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum a čas" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Uživatel" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Operace" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -629,19 +656,20 @@ "Tato položka nemá historii změn. Pravděpodobně nebyla přidána tímto " "administračním rozhraním." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Zobrazit vše" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Uložit" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Hledat" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -649,93 +677,41 @@ msgstr[1] "%(counter)s výsledky" msgstr[2] "%(counter)s výsledků" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "Celkem %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Uložit jako novou položku" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Uložit a přidat další položku" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Uložit a pokračovat v úpravách" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Nejdříve vložte uživatelské jméno a heslo. Poté budete moci upravovat více " -"uživatelských nastavení." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Vložte uživatelské jméno a heslo." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Vložte nové heslo pro uživatele %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Heslo" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Heslo (znovu)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Pro ověření vložte stejné heslo znovu." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Odebrat" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Přidat %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Odstranit?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Děkujeme za čas strávený s tímto webem." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Přihlaste se znovu" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Změna hesla" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Změna hesla byla úspěšná" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Vaše heslo bylo změněno." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -743,64 +719,48 @@ "Vložte svoje současné heslo a poté vložte dvakrát heslo nové. Omezíme tak " "možnost překlepu." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Současné heslo" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nové heslo" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Změnit heslo" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Obnovení hesla" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Heslo bylo obnoveno" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Vaše heslo bylo nastaveno. Nyní se můžete přihlásit." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potvrzení obnovy hesla" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Vložte nové heslo" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Vložte dvakrát nové heslo. Tak ověříme, že bylo zadáno správně." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nové heslo:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potvrdit heslo:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Obnovení hesla bylo neúspěšné" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -808,12 +768,7 @@ "Odkaz pro obnovení hesla byl neplatný, možná již byl použit. Požádejte o " "obnovení hesla znovu." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Obnovení hesla bylo úspěšné" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -821,7 +776,7 @@ "Návod na nastavení hesla byl odeslán na zadanou e-mailovou adresu. Měl by za " "okamžik dorazit." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -830,7 +785,7 @@ "jako ta registrovaná u vašeho účtu a zkontrolujte složku nevyžádané pošty, " "tzv. spamu." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -839,24 +794,24 @@ "Tento e-mail vám byl zaslán na základě vyžádání obnovy hesla vašeho " "uživatelskému účtu na systému %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Přejděte na následující stránku a zadejte nové heslo:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Pro jistotu vaše uživatelské jméno:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Děkujeme za používání našeho webu!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Tým aplikace %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -864,28 +819,52 @@ "Zapomněli jste heslo? Zadejte níže e-mailovou adresu a systém vám odešle " "instrukce k nastavení nového." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-mailová adresa:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Obnovit heslo" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Všechna data" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" -msgstr "(None)" +msgstr "(nic)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s: vybrat" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Vyberte položku %s ke změně" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Čas:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Hledat" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Přidat další" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Aktuálně:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Změna:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/cy/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# Maredudd ap Gwyndaf , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-26 13:53+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" @@ -18,157 +19,191 @@ "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" -msgstr "" +msgstr "%s sydd ar gael" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" +"Dyma restr o'r %s sydd ar gael. Gellir dewis rhai drwyeu dewis yn y blwch " +"isod ac yna clicio'r saeth \"Dewis\" rhwng y ddau flwch." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." -msgstr "" +msgstr "Teipiwch yn y blwch i hidlo'r rhestr o %s sydd ar gael." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" -msgstr "" +msgstr "Hidl" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" -msgstr "" +msgstr "Dewis y cyfan" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." -msgstr "" +msgstr "Cliciwch i ddewis pob %s yr un pryd." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" -msgstr "" +msgstr "Dewis" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" -msgstr "" +msgstr "Gwaredu" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" -msgstr "" +msgstr "Y %s a ddewiswyd" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" +"Dyma restr o'r %s a ddewiswyd. Gellir gwaredu rhai drwy eu dewis yn y blwch " +"isod ac yna clicio'r saeth \"Gwaredu\" rhwng y ddau flwch." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" -msgstr "" +msgstr "Gwaredu'r cyfan" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." -msgstr "" +msgstr "Cliciwch i waredu pob %s sydd wedi ei ddewis yr un pryd." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Dewiswyd %(sel)s o %(cnt)s" +msgstr[1] "Dewiswyd %(sel)s o %(cnt)s" +msgstr[2] "Dewiswyd %(sel)s o %(cnt)s" +msgstr[3] "Dewiswyd %(sel)s o %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" +"Mae ganddoch newidiadau heb eu cadw mewn meysydd golygadwy. Os rhedwch y " +"weithred fe gollwch y newidiadau." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" +"Rydych wedi dewis gweithred ond nid ydych wedi newid eich newidiadau i rai " +"meysydd eto. Cliciwch 'Iawn' i gadw. Bydd rhaid i chi ail-redeg y weithred." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" +"Rydych wedi dewis gweithred ac nid ydych wedi newid unrhyw faes. Rydych " +"siwr o fod yn edrych am y botwm 'Ewch' yn lle'r botwm 'Cadw'." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Ionawr Chwefror Mawrth Ebrill Mai Mehefin Gorffennaf Medi Hydref Tachwedd " -"Rhagfyr" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S Ll M M I G S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Noder: Rydych %s awr o flaen amser y gweinydd." +msgstr[1] "Noder: Rydych %s awr o flaen amser y gweinydd." +msgstr[2] "Noder: Rydych %s awr o flaen amser y gweinydd." +msgstr[3] "Noder: Rydych %s awr o flaen amser y gweinydd." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Noder: Rydych %s awr tu ôl amser y gweinydd." +msgstr[1] "Noder: Rydych %s awr tu ôl amser y gweinydd." +msgstr[2] "Noder: Rydych %s awr tu ôl amser y gweinydd." +msgstr[3] "Noder: Rydych %s awr tu ôl amser y gweinydd." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nawr" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Cloc" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" -msgstr "Dewis amser" +msgstr "Dewiswch amser" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" -msgstr "Hanner nos" +msgstr "Canol nos" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 y.b." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" -msgstr "Hanner dydd" +msgstr "Canol dydd" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Diddymu" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Heddiw" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendr" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ddoe" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" -msgstr "Yfory" +msgstr "Fory" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Ionawr Chwefror Mawrth Ebrill Mai Mehefin Gorffennaf Awst Medi Hydref " +"Tachwedd Rhagfyr" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S Ll M M I G S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Dangos" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Cuddio" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/cy/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/cy/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/cy/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/cy/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/cy/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,13 +2,15 @@ # # Translators: # Jannis Leidel , 2011 +# Maredudd ap Gwyndaf , 2014 +# pjrobertson , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-23 17:32+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" @@ -18,830 +20,852 @@ "Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != " "11) ? 2 : 3;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "" +msgstr "Dilëwyd %(count)d %(items)s yn llwyddiannus." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" -msgstr "" +msgstr "Ni ellir dileu %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ydych yn sicr?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "" +msgstr "Dileu y %(verbose_name_plural)s â ddewiswyd" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Gweinyddu" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" -msgstr "" +msgstr "Pob un" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ie" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Na" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" -msgstr "" +msgstr "Anhysybys" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" -msgstr "Unrhyw dyddiad" +msgstr "Unrhyw ddyddiad" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Heddiw" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" -msgstr "7 diwrnod gorffennol" +msgstr "7 diwrnod diwethaf" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Mis yma" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" -msgstr "Blwyddyn yma" +msgstr "Eleni" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"Teipiwch yr %(username)s a chyfrinair cywir ar gyfer cyfrif staff. Noder y " +"gall y ddau faes fod yn sensitif i lythrennau bach a llythrennau bras." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" -msgstr "" +msgstr "Gweithred:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" -msgstr "amser gweithred" +msgstr "amser y weithred" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id gwrthrych" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr gwrthrych" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "fflag gweithred" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" -msgstr "neges newid" +msgstr "neges y newid" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "cofnod" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "cofnodion" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." -msgstr "" +msgstr "Ychwanegwyd \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "" +msgstr "Newidwyd \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" -msgstr "" +msgstr "Dilëwyd \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" -msgstr "" +msgstr "Gwrthrych LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" -msgstr "" +msgstr "Dim" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Newidiwyd %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" -msgstr "ac" +msgstr "a" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "" +msgstr "Wedi ychwanegu %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "" +msgstr "Wedi newid %(list)s ar gyfer %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." -msgstr "" +msgstr "Dilëwyd %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." -msgstr "" +msgstr "Ni newidwyd unrhwy feysydd." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" +"Ychwanegwyd %(name)s \"%(obj)s\" yn llwyddianus. Gellir ei olygu eto isod." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" +"Ychwanegwyd %(name)s \"%(obj)s\" yn llwyddiannus. Gallwch ychwanegu %(name)s " +"arall isod." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "" +msgstr "Ychwanegwyd %(name)s \"%(obj)s\" yn llwyddiannus." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" +"Ychwanegwyd %(name)s \"%(obj)s\" yn llwyddianus. Gellir ei olygu eto isod." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" +"Ychwanegwyd %(name)s \"%(obj)s\" yn llwyddiannus. Gallwch ychwanegu %(name)s " +"arall isod." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "" +msgstr "Newidwyd %(name)s \"%(obj)s\" yn llwyddiannus." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" +"Rhaid dewis eitemau er mwyn gweithredu arnynt. Ni ddewiswyd unrhyw eitemau." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." -msgstr "" +msgstr "Ni ddewiswyd gweithred." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Ychwanegu %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Dilëwyd %(name)s \"%(obj)s\" yn llwyddiannus." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" +msgstr "Nid ydy gwrthrych %(name)s gyda'r prif allwedd %(key)r yn bodoli." + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Ychwanegu %s" -#: options.py:1207 +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" -msgstr "Newidio %s" +msgstr "Newid %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" -msgstr "" +msgstr "Gwall cronfa ddata" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Newidwyd %(count)s %(name)s yn llwyddiannus" +msgstr[1] "Newidwyd %(count)s %(name)s yn llwyddiannus" +msgstr[2] "Newidwyd %(count)s %(name)s yn llwyddiannus" +msgstr[3] "Newidwyd %(count)s %(name)s yn llwyddiannus" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Dewiswyd %(total_count)s" +msgstr[1] "Dewiswyd %(total_count)s" +msgstr[2] "Dewiswyd %(total_count)s" +msgstr[3] "Dewiswyd %(total_count)s" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" -msgstr "" - -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" +msgstr "Dewiswyd 0 o %(cnt)s" -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Hanes newid: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Byddai dileu %(class_name)s %(instance)s yn golygu dileu'r gwrthrychau " +"gwarchodedig canlynol sy'n perthyn: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Mewngofnodi" - -#: sites.py:386 -msgid "Site administration" -msgstr "Gweinyddiad safle" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dyddiad:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Amser:" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Adran weinyddol safle Django" -#: widgets.py:165 -msgid "Lookup" -msgstr "" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Gweinyddu Django" -#: widgets.py:260 -msgid "Add Another" -msgstr "" +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "Gweinyddu'r safle" -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Mewngofnodi" -#: widgets.py:303 -msgid "Change:" -msgstr "" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Gweinyddu %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" -msgstr "Tudalen heb ei ddarganfod" +msgstr "Ni ddarganfyddwyd y dudalen" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "Mae'n ddrwg gennym, ond nid darganfwyd y dudalen a dymunwyd" +msgstr "Mae'n ddrwg gennym, ond ni ddarganfuwyd y dudalen" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" -msgstr "Adref" +msgstr "Hafan" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" -msgstr "Gwall gweinyddwr" +msgstr "Gwall gweinydd" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" -msgstr "Gwall gweinyddwr (500)" +msgstr "Gwall gweinydd (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" -msgstr "Gwall Gweinyddwr (500)" +msgstr "Gwall Gweinydd (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" +"Mae gwall ac gyrrwyd adroddiad ohono i weinyddwyr y wefan drwy ebost a dylai " +"gael ei drwsio yn fuan. Diolch am fod yn amyneddgar." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" -msgstr "" +msgstr "Rhedeg y weithred a ddewiswyd" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" -msgstr "Ewch" +msgstr "Ffwrdd â ni" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" +"Cliciwch fan hyn i ddewis yr holl wrthrychau ar draws yr holl dudalennau" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" -msgstr "" +msgstr "Dewis y %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" +msgstr "Clirio'r dewis" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." msgstr "" +"Yn gyntaf, rhowch enw defnyddiwr a chyfrinair. Yna byddwch yn gallu golygu " +"mwy o ddewisiadau." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Rhowch enw defnyddiwr a chyfrinair." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Newid cyfrinair" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Cywirwch y gwall isod." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Cywirwch y gwallau isod." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "" +msgid "Enter a new password for the user %(username)s." +msgstr "Rhowch gyfrinair newydd i'r defnyddiwr %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Cyfrinair" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Cyfrinair (eto)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Rhowch yr un cyfrinair ag uchod, er mwyn ei wirio." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Croeso," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dogfennaeth" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Newid cyfrinair" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Allgofnodi" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Gweinyddiad safle Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Gweinyddiad Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Ychwanegu" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Hanes" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" -msgstr "Gweld ar safle" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" +msgstr "Gweld ar y safle" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Ychwanegu %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" -msgstr "" +msgstr "Hidl" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" -msgstr "" +msgstr "Gwaredu o'r didoli" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" -msgstr "" +msgstr "Blaenoriaeth didoli: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" -msgstr "" +msgstr "Toglio didoli" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Dileu" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" +"Byddai dileu %(object_name)s '%(escaped_object)s' yn golygu dileu'r " +"gwrthrychau sy'n perthyn, ond nid oes ganddoch ganiatâd i ddileu y mathau " +"canlynol o wrthrychau:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" +"Byddai dileu %(object_name)s '%(escaped_object)s' yn golygu dileu'r " +"gwrthrychau gwarchodedig canlynol sy'n perthyn:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" +"Ydych yn sicr eich bod am ddileu %(object_name)s \"%(escaped_object)s\"? " +"Dilëir yr holl eitemau perthnasol canlynol:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" -msgstr "Yndw, rwy'n sicr" +msgstr "Ydw, rwy'n sicr" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" -msgstr "" +msgstr "Dileu mwy nag un gwrthrych" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" +"Byddai dileu %(objects_name)s yn golygu dileu'r gwrthrychau sy'n perthyn, " +"ond nid oes ganddoch ganiatâd i ddileu y mathau canlynol o wrthrychau:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" +"Byddai dileu %(objects_name)s yn golygu dileu'r gwrthrychau gwarchodedig " +"canlynol sy'n perthyn:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" +"Ydych yn sicr eich bod am ddileu'r %(objects_name)s a ddewiswyd? Dilëir yr " +"holl wrthrychau canlynol a'u heitemau perthnasol:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Gwaredu" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Ychwanegu %(verbose_name)s arall" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Dileu?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " -msgstr "" +msgstr "Wrth %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" -msgstr "" +msgstr "Modelau yn y rhaglen %(name)s " -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" -msgstr "Newidio" +msgstr "Newid" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." -msgstr "Does genych ddim hawl i olygu unrhywbeth." +msgstr "Does gennych ddim hawl i olygu unrhywbeth." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" -msgstr "Gweithredau Diweddar" +msgstr "Gweithredoedd Diweddar" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" -msgstr "Fy Ngweithredau" +msgstr "Fy Ngweithredoedd" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Dim ar gael" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" -msgstr "" +msgstr "Cynnwys anhysbys" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" +"Mae rhywbeth o'i le ar osodiad y gronfa ddata. Sicrhewch fod y tablau " +"cronfa ddata priodol wedi eu creu, a sicrhewch fod y gronfa ddata yn " +"ddarllenadwy gan y defnyddiwr priodol." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Cyfrinair:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" -msgstr "" +msgstr "Anghofioch eich cyfrinair neu enw defnyddiwr?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dyddiad/amser" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Defnyddiwr" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Gweithred" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Does dim hanes newid gan y gwrthrych yma. Mae'n debyg ni ychwanegwyd drwy'r " -"safle gweinydd yma." +"Does dim hanes newid gan y gwrthrych yma. Mae'n debyg nad ei ychwanegwyd " +"drwy'r safle gweinydd yma." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" -msgstr "" +msgstr "Dangos pob canlyniad" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Cadw" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" -msgstr "" +msgstr "Chwilio" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "%(counter)s canlyniad" +msgstr[1] "%(counter)s canlyniad" +msgstr[2] "%(counter)s canlyniad" +msgstr[3] "%(counter)s canlyniad" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" -msgstr "" +msgstr "Cyfanswm o %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Cadw fel newydd" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Cadw ac ychwanegu un arall" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" -msgstr "Cadw ac parhau i olygu" - -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" +msgstr "Cadw a pharhau i olygu" -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "Diolch am dreulio amser ansawdd gyda'r safle we heddiw 'ma." +msgstr "Diolch am dreulio amser o ansawdd gyda'r safle we yma heddiw." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Ailmewngofnodi" +msgstr "Mewngofnodi eto" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Newid cyfrinair" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Newid cyfrinair yn lwyddianus" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Newidwyd eich cyfrinair." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Rhowch eich cyfrinair hen, er mwyn gwarchodaeth, yna rhowch eich cyfrinair " -"newydd dwywaith er mwyn i ni wirio y teipiwyd yn gywir." +"Rhowch eich hen gyfrinair, er mwyn diogelwch, ac yna rhowch eich cyfrinair " +"newydd ddwywaith er mwyn gwirio y'i teipiwyd yn gywir." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" -msgstr "" +msgstr "Hen gyfrinair" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" -msgstr "" +msgstr "Cyfrinair newydd" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" -msgstr "Newidio fy nghyfrinair" +msgstr "Newid fy nghyfrinair" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Ailosod cyfrinair" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." -msgstr "" +msgstr "Mae'ch cyfrinair wedi ei osod. Gallwch fewngofnodi nawr." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" -msgstr "" +msgstr "Cadarnhad ailosod cyfrinair" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" +"Rhowch eich cyfrinair newydd ddwywaith er mwyn gwirio y'i teipiwyd yn gywir." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Cyfrinair newydd:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" -msgstr "Cadarnhewch cyfrinair:" - -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" +msgstr "Cadarnhewch y cyfrinair:" -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" +"Roedd y ddolen i ailosod y cyfrinair yn annilys, o bosib oherwydd ei fod " +"wedi ei ddefnyddio'n barod. Gofynnwch i ailosod y cyfrinair eto." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Ailosod cyfrinair yn lwyddianus" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"Fe'ch ebostiwyd gyda cyfarwyddiadau ar osod eich cyfrinair. Dylech ei " +"dderbyn yn fuan." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Os na dderbyniwch ebost, sicrhewych y rhoddwyd y cyfeiriad sydd wedi ei " +"gofrestru gyda ni, ac edrychwch yn eich ffolder sbam." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" +"Derbyniwch yr ebost hwn oherwydd i chi ofyn i ailosod y cyfrinair i'ch " +"cyfrif yn %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" -msgstr "" +msgstr "Ewch i'r dudalen olynol a dewsiwch gyfrinair newydd:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" -msgstr "Eich enw defnyddiwr, rhag ofn chi wedi anghofio:" +msgstr "Eich enw defnyddiwr, rhag ofn eich bod wedi anghofio:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Diolch am ddefnyddio ein safle!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" -msgstr "Y tîm %(site_name)s" +msgstr "Tîm %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"Anghofioch eich cyfrinair? Rhowch eich cyfeiriad ebost isod ac fe ebostiwn " +"gyfarwyddiadau ar osod un newydd." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "" +msgstr "Cyfeiriad ebost:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" -msgstr "Ailosodi fy nghyfrinair" +msgstr "Ailosod fy nghyfrinair" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" -msgstr "Dyddiadau i gyd" +msgstr "Holl ddyddiadau" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" -msgstr "" +msgstr "(Dim)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Dewis %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Dewis %s i newid" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dyddiad:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Amser:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Archwilio" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Ychwanegu Un Arall" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Cyfredol:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Newid:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/da/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,15 +3,16 @@ # Translators: # Christian Joergensen , 2012 # Erik Wognsen , 2012 -# Finn Gruwier, 2011 +# Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 +# valberg , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-27 10:34+0000\n" +"Last-Translator: valberg \n" "Language-Team: Danish (http://www.transifex.com/projects/p/django/language/" "da/)\n" "MIME-Version: 1.0\n" @@ -20,12 +21,12 @@ "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Tilgængelige %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +36,38 @@ "markere dem i kassen nedenfor og derefter klikke på \"Vælg\"-pilen mellem de " "to kasser." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Skriv i dette felt for at filtrere listen af tilgængelige %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtrér" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Vælg alle" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klik for at vælge alle %s med det samme." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Vælg" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Fjern" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Valgte %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -76,22 +77,24 @@ "dem i kassen nedenfor og derefter klikke på \"Fjern\"-pilen mellem de to " "kasser." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Fjern alle" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klik for at fjerne alle valgte %s med det samme." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s af %(cnt)s valgt" msgstr[1] "%(sel)s af %(cnt)s valgt" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +102,8 @@ "Du har ugemte ændringer af et eller flere redigerbare felter. Hvis du " "udfører en handling fra drop-down-menuen, vil du miste disse ændringer." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +112,8 @@ "Du har valgt en handling, men du har ikke gemt dine ændringer til et eller " "flere felter. Klik venligst OK for at gemme og vælg dernæst handlingen igen." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +122,86 @@ "Du har valgt en handling, og du har ikke udført nogen ændringer på felter. " "Det, du søger er formentlig Udfør-knappen i stedet for Gem-knappen." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januar Februar Marts April Maj Juni Juli August September Oktober November " -"December" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T O T F L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Vis" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Skjul" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Obs: Du er %s time forud i forhold servertiden." +msgstr[1] "Obs: Du er %s timer forud i forhold servertiden." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Obs: Du er %s time bagud i forhold servertiden." +msgstr[1] "Obs: Du er %s timer forud i forhold servertiden." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nu" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Ur" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Vælg et tidspunkt" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Midnat" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 morgen" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Middag" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Annuller" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "I dag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "I går" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "I morgen" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januar Februar Marts April Maj Juni Juli August September Oktober November " +"December" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T O T F L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Vis" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Skjul" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/da/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/da/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/da/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/da/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/da/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/da/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,15 +4,16 @@ # Christian Joergensen , 2012 # Dimitris Glezos , 2012 # Erik Wognsen , 2013 -# Finn Gruwier, 2011 +# Finn Gruwier Larsen, 2011 # Jannis Leidel , 2011 +# valberg , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-27 03:03+0000\n" -"Last-Translator: Erik Wognsen \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-27 10:28+0000\n" +"Last-Translator: valberg \n" "Language-Team: Danish (http://www.transifex.com/projects/p/django/language/" "da/)\n" "MIME-Version: 1.0\n" @@ -21,62 +22,68 @@ "Language: da\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s blev slettet." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Kan ikke slette %(name)s " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slet valgte %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administration" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alle" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nej" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Ukendt" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Når som helst" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "I dag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "De sidste 7 dage" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Denne måned" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Dette år" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,101 +92,98 @@ "Indtast venligst det korrekte %(username)s og adgangskode for en " "personalekonto. Bemærk at begge felter kan være versalfølsomme." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Log venligst ind igen, da din session er udløbet." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Handling" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "handlingstid" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekt-ID" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekt repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "handlingsflag" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ændringsmeddelelse" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "logmeddelelse" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "logmeddelelser" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Tilføjede \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Ændrede \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Slettede \"%(object)s\"." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry-objekt" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ingen" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Ændrede %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "og" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Tilføjede %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Ændrede %(list)s for %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettede %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ingen felter ændret." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" blev tilføjet. Du kan redigere den/det igen herunder." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +191,12 @@ msgstr "" "%(name)s \"%(obj)s\" blev tilføjet. Du kan endnu en/et %(name)s herunder." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" blev tilføjet." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -200,7 +204,7 @@ msgstr "" "%(name)s \"%(obj)s\" blev ændret. Du kan redigere den/det igen herunder." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -209,12 +213,12 @@ "%(name)s \"%(obj)s\" blev ændret. Du kan tilføje endnu en/et %(name)s " "herunder." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" blev ændret." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -222,66 +226,66 @@ "Der skal være valgt nogle emner for at man kan udføre handlinger på dem. " "Ingen emner er blev ændret." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ingen handling valgt." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Tilføj %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" blev slettet." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Der findes ikke et %(name)s-objekt med primærnøgle %(key)r." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Tilføj %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Ret %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "databasefejl" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s blev ændret." msgstr[1] "%(count)s %(name)s blev ændret." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valgt" msgstr[1] "Alle %(total_count)s valgt" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 af %(cnt)s valgt" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" blev slettet." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ændringshistorik: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -290,83 +294,71 @@ "Sletning af %(class_name)s %(instance)s vil kræve sletning af følgende " "beskyttede relaterede objekter: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Log ind" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django website-administration" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administration" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Website-administration" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administration af %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dato:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tid:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Slå op" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Tilføj endnu en" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Nuværende:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Log ind" -#: widgets.py:303 -msgid "Change:" -msgstr "Ændring:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s administration" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Siden blev ikke fundet" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Vi beklager, men den ønskede side kunne ikke findes" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Hjem" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serverfejl" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serverfejl (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serverfejl (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -374,120 +366,141 @@ "Der opstod en fejl. Fejlen er rapporteret til website-administratoren via e-" "mail, og vil blive rettet hurtigst muligt. Tak for din tålmodighed." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Udfør den valgte handling" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Udfør" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klik her for at vælge objekter på tværs af alle sider" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Vælg alle %(total_count)s %(module_name)s " -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Ryd valg" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Indtast først et brugernavn og en adgangskode. Derefter får du yderligere " +"redigeringsmuligheder." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Indtast et brugernavn og en adgangskode." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Skift adgangskode" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Ret venligst fejlene herunder." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Ret venligst fejlene herunder." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Indtast en ny adgangskode for brugeren %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Adgangskode" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Adgangskode (igen)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Indtast den samme adgangskode som ovenfor for verifikation." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Velkommen," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentation" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Skift adgangskode" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Log ud" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django website-administration" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administration" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Tilføj" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historik" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Se på website" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Ret venligst fejlene herunder." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Ret venligst fejlene herunder." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Tilføj %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrer" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Fjern fra sortering" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorteringsprioritet: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Skift sortering" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Slet" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -498,7 +511,7 @@ "relaterede objekter, men din konto har ikke rettigheder til at slette " "følgende objekttyper:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -507,7 +520,7 @@ "Sletning af %(object_name)s ' %(escaped_object)s ' vil kræve sletning af " "følgende beskyttede relaterede objekter:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -516,16 +529,16 @@ "Er du sikker på du vil slette %(object_name)s \"%(escaped_object)s\"? Alle " "de følgende relaterede objekter vil blive slettet:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Slet flere objekter" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -536,7 +549,7 @@ "relaterede objekter, men din konto har ikke tilladelse til at slette " "følgende typer af objekter:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -545,7 +558,7 @@ "Sletning af de valgte %(objects_name)s vil kræve sletning af følgende " "beskyttede relaterede objekter:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -554,41 +567,56 @@ "Er du sikker på du vil slette de valgte %(objects_name)s? Alle de følgende " "objekter og deres relaterede emner vil blive slettet:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Fjern" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Tilføj endnu en %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Slet?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Efter %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modeller i applikationen %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Ret" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Du har ikke rettigheder til at foretage ændringer." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Seneste handlinger" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mine handlinger" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ingen tilgængelige" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Ukendt indhold" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +626,27 @@ "databasetabellerne er blevet oprettet og at databasen er læsbar for den " "pågældende bruger." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Adgangskode:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Har du glemt dit password eller brugernavn?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dato/tid" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Bruger" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Funktion" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,112 +654,61 @@ "Dette objekt har ingen ændringshistorik. Det blev formentlig ikke tilføjet " "via dette administrations-site" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Vis alle" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Gem" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Søg" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultat" msgstr[1] "%(counter)s resultater" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s i alt" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Gem som ny" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Gem og tilføj endnu en" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Gem og fortsæt med at redigere" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Indtast først et brugernavn og en adgangskode. Derefter får du yderligere " -"redigeringsmuligheder." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Indtast et brugernavn og en adgangskode." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Indtast en ny adgangskode for brugeren %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Adgangskode" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Adgangskode (igen)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Indtast den samme adgangskode som ovenfor for verifikation." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Fjern" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Tilføj endnu en %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Slet?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Tak for den kvalitetstid du brugte på websitet i dag." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Log ind igen" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Skift adgangskode" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Adgangskoden blev ændret" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Din adgangskode blev ændret." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -740,46 +717,34 @@ "din nye adgangskode to gange, så vi kan være sikre på, at den er indtastet " "korrekt." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Gammel adgangskode" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Ny adgangskode" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Skift min adgangskode" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Nulstil adgangskode" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Adgangskoden blev nulstillet" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Din adgangskode er blevet sat. Du kan logge ind med den nu." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Bekræftelse for nulstilling af adgangskode" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Indtast ny adgangskode" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -787,19 +752,15 @@ "Indtast venligst din nye adgangskode to gange, så vi kan være sikre på, at " "den er indtastet korrekt." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Ny adgangskode:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Bekræft ny adgangskode:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Adgangskoden blev ikke nulstillet" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,12 +768,7 @@ "Linket for nulstilling af adgangskoden er ugyldigt, måske fordi det allerede " "har været brugt. Anmod venligst påny om nulstilling af adgangskoden." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Adgangskoden blev nulstillet" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -820,7 +776,7 @@ "Vi har sendt dig instruktioner i at vælge en adgangskode til den e-mail-" "adresse, du angav. Du skulle modtage dem inden længe." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -828,7 +784,7 @@ "Hvis du ikke modtager en e-mail, så tjek venligst, at du har indtastet den e-" "mail-adresse, du registrerede dig med, og tjek din spam-mappe." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -837,24 +793,24 @@ "Du modtager denne e-mail, fordi du har anmodet om en nulstilling af " "adgangskoden til din brugerkonto ved %(site_name)s ." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Gå venligst til denne side og vælg en ny adgangskode:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "For det tilfælde at du skulle have glemt dit brugernavn er det:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Tak fordi du brugte vores website!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Med venlig hilsen %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -862,28 +818,52 @@ "Har du glemt din adgangskode? Skriv din e-mail-adresse herunder, så sender " "vi dig instruktioner i at vælge en ny adgangskode." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-mail-adresse:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Nulstil min adgangskode" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alle datoer" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ingen)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Vælg %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Vælg %s, der skal ændres" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dato:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tid:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Slå op" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Tilføj endnu en" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Nuværende:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ændring:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/de/LC_MESSAGES/djangojs.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é Hagenbruch , 2011-2012 -# Jannis Leidel , 2011 +# André Hagenbruch, 2011-2012 +# Jannis Leidel , 2011,2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 07:21+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: German (http://www.transifex.com/projects/p/django/language/" "de/)\n" "MIME-Version: 1.0\n" @@ -18,89 +18,90 @@ "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Verfügbare %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -"Dies ist die Liste der verfügbaren %s. Durch Markierung im unten stehenden " -"Feld und Klicken des 'Auswählen'-Pfeils zwischen den beiden Feldern lassen " -"sich einige auswählen." +"Dies ist die Liste der verfügbaren %s. Einfach im unten stehenden Feld " +"markieren und mithilfe des \"Auswählen\"-Pfeils auswählen." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -"Durch Tippen in diesem Feld lässt sich die Liste der verfügbaren %s " +"Durch Eingabe in diesem Feld lässt sich die Liste der verfügbaren %s " "eingrenzen." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Alle auswählen" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klicken, um alle %s auf einmal auszuwählen." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Auswählen" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Entfernen" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Ausgewählte %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -"Dies ist die Liste der ausgewählten %s. Durch Markierung im unten stehenden " -"Feld und Klicken des \"Entfernen\"-Pfeils zwischen den Feldern lassen sich " -"einige entfernen." +"Dies ist die Liste der ausgewählten %s. Einfach im unten stehenden Feld " +"markieren und mithilfe des \"Entfernen\"-Pfeils wieder entfernen." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Alle entfernen" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klicken, um alle ausgewählten %s auf einmal zu entfernen." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s von %(cnt)s ausgewählt" msgstr[1] "%(sel)s von %(cnt)s ausgewählt" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -"Sie haben Änderungen an editierbaren Feldern vorgenommen und nicht " +"Sie haben Änderungen an bearbeitbaren Feldern vorgenommen und nicht " "gespeichert. Wollen Sie die Aktion trotzdem ausführen und Ihre Änderungen " "verwerfen?" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -110,80 +111,97 @@ "gespeichert. Klicken Sie OK, um dennoch zu speichern. Danach müssen Sie die " "Aktion erneut ausführen." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -"Sie haben eine Aktion ausgewählt, aber keine Änderungen an editierbaren " -"Feldern vorgenommen. Sie wollten wahrscheinlich auf 'Ausführen' und nicht " -"auf 'Speichern' klicken." +"Sie haben eine Aktion ausgewählt, aber keine Änderungen an bearbeitbaren " +"Feldern vorgenommen. Sie wollten wahrscheinlich auf \"Ausführen\" und nicht " +"auf \"Speichern\" klicken." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Achtung: Sie sind %s Stunde der Serverzeit vorraus." +msgstr[1] "Achtung: Sie sind %s Stunden der Serverzeit vorraus." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Achtung: Sie sind %s Stunde hinter der Serverzeit." +msgstr[1] "Achtung: Sie sind %s Stunden hinter der Serverzeit." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januar Februar März April Mai Juni Juli August September Oktober November " -"Dezember" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M D M D F S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Einblenden" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ausblenden" - -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Jetzt" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Uhr" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Uhrzeit" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Mitternacht" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 Uhr" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mittag" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Abbrechen" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Heute" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Gestern" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Morgen" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januar Februar März April Mai Juni Juli August September Oktober November " +"Dezember" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M D M D F S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Einblenden" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ausblenden" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/de/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/de/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/de/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/de/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/de/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/de/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# André Hagenbruch , 2012 -# apollo13 , 2011 +# André Hagenbruch, 2012 +# Florian Apolloner , 2011 # Dimitris Glezos , 2012 -# Jannis , 2013 -# Jannis Leidel , 2013 +# Jannis Vajen, 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-23 08:24+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 07:14+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: German (http://www.transifex.com/projects/p/django/language/" "de/)\n" @@ -22,62 +22,68 @@ "Language: de\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Erfolgreich %(count)d %(items)s gelöscht." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Kann %(name)s nicht löschen" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Sind Sie sicher?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Ausgewählte %(verbose_name_plural)s löschen" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administration" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alle" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nein" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Unbekannt" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Alle Daten" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Heute" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Letzte 7 Tage" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Diesen Monat" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Dieses Jahr" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -86,94 +92,91 @@ "Bitte einen gültigen %(username)s und ein Passwort für einen Staff-Account " "eingeben. Beide Felder berücksichtigen die Groß-/Kleinschreibung." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Bitte melden Sie sich erneut an, da Ihre Sitzung abgelaufen ist." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Aktion:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "Zeitpunkt der Aktion" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "Objekt-ID" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "Objekt Darst." -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "Aktionskennzeichen" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "Änderungsmeldung" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "Logeintrag" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "Logeinträge" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" hinzufügt." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" verändert - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" gelöscht." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry Objekt" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "-" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s geändert." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "und" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" hinzugefügt." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s von %(name)s \"%(object)s\" geändert." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" gelöscht." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Keine Felder geändert." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -181,7 +184,7 @@ "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt und kann unten geändert " "werden." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -190,12 +193,12 @@ "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt. Es kann jetzt ein " "weiteres %(name)s unten hinzugefügt werden." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich hinzugefügt." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -204,7 +207,7 @@ "%(name)s \"%(obj)s\" wurde erfolgreich geändert. Weitere Änderungen können " "unten vorgenommen werden." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -213,12 +216,12 @@ "%(name)s \"%(obj)s\" wurde erfolgreich geändert. Es kann jetzt ein weiteres " "%(name)s unten hinzugefügt werden." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" wurde erfolgreich geändert." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -226,67 +229,67 @@ "Es müssen Objekte aus der Liste ausgewählt werden, um Aktionen " "durchzuführen. Es wurden keine Objekte geändert." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Keine Aktion ausgewählt." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s hinzufügen" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" "Das %(name)s-Objekt mit dem Primärschlüssel %(key)r ist nicht vorhanden." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s hinzufügen" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s ändern" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Datenbankfehler" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s \"%(name)s\" wurde erfolgreich geändert." msgstr[1] "%(count)s \"%(name)s\" wurden erfolgreich geändert." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ausgewählt" msgstr[1] "Alle %(total_count)s ausgewählt" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 von %(cnt)s ausgewählt" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" wurde erfolgreich gelöscht." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Änderungsgeschichte: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -295,84 +298,72 @@ "Das Löschen des %(class_name)s-Objekts „%(instance)s“ würde ein Löschen der " "folgenden geschützten verwandten Objekte erfordern: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Anmelden" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django-Systemverwaltung" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django-Verwaltung" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Website-Verwaltung" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s-Verwaltung" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Zeit:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Suchen" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Neu hinzufügen" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Aktuell:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Anmelden" -#: widgets.py:303 -msgid "Change:" -msgstr "Ändern:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s-Administration" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Seite nicht gefunden" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Start" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serverfehler" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serverfehler (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serverfehler (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -380,120 +371,143 @@ "Ein Fehler ist aufgetreten und wurde an die Administratoren per E-Mail " "gemeldet. Danke für die Geduld, der Fehler sollte in Kürze behoben sein." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Ausgewählte Aktion ausführen" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ausführen" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Hier klicken, um die Objekte aller Seiten auszuwählen" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Alle %(total_count)s %(module_name)s auswählen" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Auswahl widerrufen" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere " +"Optionen für den Benutzer geändert werden." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Bitte einen Benutzernamen und ein Passwort eingeben." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Passwort ändern" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Bitte die aufgeführten Fehler korrigieren." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Bitte die unten aufgeführten Fehler korrigieren." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Bitte geben Sie ein neues Passwort für den Benutzer %(username)s ein." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Passwort" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Passwort (wiederholen)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Willkommen," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentation" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Passwort ändern" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Abmelden" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django-Systemverwaltung" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django-Verwaltung" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Hinzufügen" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Geschichte" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Auf der Website anzeigen" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Bitte die aufgeführten Fehler korrigieren." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Bitte die unten aufgeführten Fehler korrigieren." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s hinzufügen" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Aus der Sortierung entfernen" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sortierung: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Sortierung ein-/ausschalten" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Löschen" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -504,7 +518,7 @@ "davon abhängiger Daten zur Folge, aber Sie haben nicht die nötigen Rechte, " "um die folgenden davon abhängigen Daten zu löschen:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -513,7 +527,7 @@ "Das Löschen von %(object_name)s „%(escaped_object)s“ würde ein Löschen der " "folgenden geschützten verwandten Objekte erfordern:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -522,16 +536,16 @@ "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen " "wollen? Es werden zusätzlich die folgenden davon abhängigen Daten gelöscht:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Mehrere Objekte löschen" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -542,7 +556,7 @@ "verwandter Objekte resultieren, allerdings besitzt Ihr Benutzerkonto nicht " "die nötigen Rechte, um diese zu löschen:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -551,7 +565,7 @@ "Das Löschen der ausgewählten %(objects_name)s würde ein Löschen der " "folgenden geschützten verwandten Objekte erfordern:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -560,41 +574,56 @@ "Sind Sie sicher, dass Sie die ausgewählten %(objects_name)s löschen wollen? " "Alle folgenden Objekte und ihre verwandten Objekte werden gelöscht:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Entfernen" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "%(verbose_name)s hinzufügen" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Löschen?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Nach %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelle der %(name)s-Anwendung" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Ändern" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Sie haben keine Berechtigung, irgendetwas zu ändern." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Kürzliche Aktionen" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Meine Aktionen" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Keine vorhanden" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Unbekannter Inhalt" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -604,27 +633,27 @@ "die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom " "verwendeten Datenbankbenutzer auch lesbar ist." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Passwort:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Benutzername oder Passwort vergessen?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/Zeit" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Benutzer" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Aktion" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -632,114 +661,61 @@ "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht " "über diese Verwaltungsseiten angelegt." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Zeige alle" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Sichern" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Suchen" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s Ergebnis" msgstr[1] "%(counter)s Ergebnisse" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s gesamt" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Als neu sichern" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Sichern und neu hinzufügen" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Sichern und weiter bearbeiten" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere " -"Optionen für den Benutzer geändert werden." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Bitte einen Benutzernamen und ein Passwort eingeben." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Bitte geben Sie ein neues Passwort für den Benutzer %(username)s ein." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Passwort" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Passwort (wiederholen)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Entfernen" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "%(verbose_name)s hinzufügen" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Löschen?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Vielen Dank, dass Sie hier ein paar nette Minuten verbracht haben." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Erneut anmelden" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Passwort ändern" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Passwort erfolgreich geändert" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ihr Passwort wurde geändert." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -748,46 +724,34 @@ "dann zweimal (um sicherzustellen, dass Sie es korrekt eingegeben haben) das " "neue Passwort ein." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Altes Passwort" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Neues Passwort" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Mein Passwort ändern" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Passwort zurücksetzen" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Passwort zurücksetzen beendet" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Ihr Passwort wurde zurückgesetzt. Sie können sich nun anmelden." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Zurücksetzen des Passworts bestätigen" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Neues Passwort eingeben" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -795,19 +759,15 @@ "Bitte geben Sie Ihr neues Passwort zweimal ein, damit wir überprüfen können, " "ob es richtig eingetippt wurde." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Neues Passwort:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Passwort wiederholen:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Passwort wurde nicht erfolgreich zurückgesetzt" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -815,12 +775,7 @@ "Der Link zum Zurücksetzen Ihres Passworts ist ungültig, wahrscheinlich weil " "er schon einmal benutzt wurde. Bitte setzen Sie Ihr Passwort erneut zurück." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Passwort wurde erfolgreich zurückgesetzt" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -828,7 +783,7 @@ "Wir haben eine E-Mail zum Setzen eines neuen Passwortes an die angegebene E-" "Mail-Adresse gesendet. Sie sollte in Kürze ankommen." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -836,7 +791,7 @@ "Falls die E-Mail nicht angekommen sein sollte, bitte die E-Mail-Adresse auf " "Richtigkeit und gegebenenfalls den Spam-Ordner überprüfen." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -845,24 +800,24 @@ "Diese E-Mail wurde aufgrund einer Anfrage zum Zurücksetzen des Passworts auf " "der Website %(site_name)s versendet." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Bitte öffnen Sie folgende Seite, um Ihr neues Passwort einzugeben:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Ihr Benutzername, falls Sie ihn vergessen haben:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Vielen Dank, dass Sie unsere Webseite benutzen!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Das Team von %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -870,28 +825,52 @@ "Passwort vergessen? Einfach die E-Mail-Adresse unten eingeben und den " "Anweisungen zum Zurücksetzen des Passworts in der E-Mail folgen." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-Mail-Adresse:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Mein Passwort zurücksetzen" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alle Daten" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(leer)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s auswählen" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s zur Änderung auswählen" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Zeit:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Suchen" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Neu hinzufügen" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Aktuell:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ändern:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/el/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,16 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Dimitris Glezos , 2011. -# glogiotatidis , 2011. -# Jannis Leidel , 2011. +# Dimitris Glezos , 2011 +# glogiotatidis , 2011 +# Jannis Leidel , 2011 +# nikolas demiridis , 2014 +# Panos Laganakos , 2014 msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:35+0100\n" -"PO-Revision-Date: 2012-03-08 10:42+0000\n" -"Last-Translator: Dimitris Glezos \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-17 09:25+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" @@ -19,162 +21,188 @@ "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Διαθέσιμο %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" +"Αυτή είναι η λίστα των διαθέσιμων %s. Μπορείτε να επιλέξετε κάποια, από το " +"παρακάτω πεδίο και πατώντας το βέλος \"Επιλογή\" μεταξύ των δύο πεδίων." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" +"Πληκτρολογήστε σε αυτό το πεδίο για να φιλτράρετε τη λίστα των διαθέσιμων %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Φίλτρο" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" -msgstr "Επιλογή Όλων" +msgstr "Επιλογή όλων" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." -msgstr "" +msgstr "Πατήστε για επιλογή όλων των %s με τη μία." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" -msgstr "" +msgstr "Επιλογή" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Αφαίρεση" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" -msgstr "Επιλεχθέντα %s" +msgstr "Επιλέχθηκε %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" +"Αυτή είναι η λίστα των επιλεγμένων %s. Μπορείτε να αφαιρέσετε μερικά " +"επιλέγοντας τα απο το κουτί παρακάτω και μετά κάνοντας κλίκ στο βελάκι " +"\"Αφαίρεση\" ανάμεσα στα δύο κουτιά." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" -msgstr "" +msgstr "Αφαίρεση όλων" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." -msgstr "" +msgstr "Κλίκ για να αφαιρεθούν όλα τα επιλεγμένα %s αμέσως." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" -msgstr[0] "%(sel)s από %(cnt)s επιλέγηκε" -msgstr[1] "%(sel)s από %(cnt)s επιλέγηκαν" +msgstr[0] "%(sel)s από %(cnt)s επιλεγμένα" +msgstr[1] "%(sel)s από %(cnt)s επιλεγμένα" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -"Έχετε μη αποθηκευμένες αλλαγές σε επιμέρους επεξεργάσημα πεδία. Εάν " -"εκτελέσετε μια ενέργεια, οι αλλαγές σας θα χαθούν." +"Έχετε μη αποθηκευμένες αλλαγές σε μεμονωμένα επεξεργάσιμα πεδία. Άν " +"εκτελέσετε μια ενέργεια, οι μη αποθηκευμένες αλλάγες θα χαθούν" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -"Έχετε επιλέξει μια ενέργεια, αλλά ακόμη δεν έχετε αποθηκεύσει τις αλλαγές " -"επιμέρους πεδίων. Παρακαλώ επιλέξτε ΟΚ για να αποθηκεύσετε. Θα χρειαστεί να " -"επαναλάβετε την ενέργεια." +"Έχετε επιλέξει μια ενέργεια, αλλά δεν έχετε αποθηκεύσει τις αλλαγές στα " +"εκάστωτε πεδία ακόμα. Παρακαλώ πατήστε ΟΚ για να τις αποθηκεύσετε. Θα " +"χρειαστεί να εκτελέσετε ξανά την ενέργεια." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -"Έχετε επιλέξει μια ενέργεια και δεν έχετε κάνει καμία αλλαγή σε επιμέρους " -"πεδία. Πιθανώς ψάχνετε για το κουμπί Go και όχι το κουμπί Αποθήκευση." - -#: static/admin/js/calendar.js:26 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Ιανουάριος Φεβρουάριος Μάρτιος Απρίλιος Μάιος Ιούνιος Ιούλιος Αύγουστος " -"Σεπτέμβριος Οκτώβριος Νοέμβριος Δεκέμβριος" - -#: static/admin/js/calendar.js:27 -msgid "S M T W T F S" -msgstr "Κ Δ Τ Τ Π Π Σ" +"Έχετε επιλέξει μια ενέργεια, και δεν έχετε κάνει καμία αλλαγή στα εκάστωτε " +"πεδία. Πιθανών θέλετε το κουμπί Go αντί του κουμπιού Αποθήκευσης." -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Εμφάνιση" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Σημείωση: Είστε %s ώρα μπροστά από την ώρα του εξυπηρετητή." +msgstr[1] "Σημείωση: Είστε %s ώρες μπροστά από την ώρα του εξυπηρετητή." -#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Απόκρυψη" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Σημείωση: Είστε %s ώρα πίσω από την ώρα του εξυπηρετητή" +msgstr[1] "Σημείωση: Είστε %s ώρες πίσω από την ώρα του εξυπηρετητή." -#: static/admin/js/admin/DateTimeShortcuts.js:49 -#: static/admin/js/admin/DateTimeShortcuts.js:85 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Τώρα" -#: static/admin/js/admin/DateTimeShortcuts.js:53 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Ρολόι" -#: static/admin/js/admin/DateTimeShortcuts.js:81 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" -msgstr "Διαλέξτε ώρα" +msgstr "Επιλέξτε χρόνο" -#: static/admin/js/admin/DateTimeShortcuts.js:86 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Μεσάνυχτα" -#: static/admin/js/admin/DateTimeShortcuts.js:87 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 π.μ." -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Μεσημέρι" -#: static/admin/js/admin/DateTimeShortcuts.js:92 -#: static/admin/js/admin/DateTimeShortcuts.js:204 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" -msgstr "Άκυρο" +msgstr "Ακύρωση" -#: static/admin/js/admin/DateTimeShortcuts.js:144 -#: static/admin/js/admin/DateTimeShortcuts.js:197 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Σήμερα" -#: static/admin/js/admin/DateTimeShortcuts.js:148 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Ημερολόγιο" -#: static/admin/js/admin/DateTimeShortcuts.js:195 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" -msgstr "Χθες" +msgstr "Χθές" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Αύριο" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Ιανουάριος Φεβρουάριος Μάρτιος Απρίλιος Μάιος Ιούνιος Ιούλιος Αύγουστος " +"Σεπτέμβρης Οκτώβριος Νοέμβριος Δεκέμβριος" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Κ Δ Τ Τ Π Π Σ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Προβολή" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Απόκρυψη" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/el/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/el/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/el/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/el/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/el/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/el/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,15 @@ # Translators: # Dimitris Glezos , 2011 # Jannis Leidel , 2011 +# Panos Laganakos , 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-17 08:42+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" @@ -19,156 +20,162 @@ "Language: el\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Επιτυχημένη διαγραφή %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Αδύνατη τη διαγραφή του %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Είστε σίγουροι;" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Διαγραφη επιλεγμένων %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Διαχείριση" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Όλα" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ναι" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Όχι" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Άγνωστο" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Οποιαδήποτε ημερομηνία" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Σήμερα" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Τελευταίες 7 ημέρες" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Αυτόν το μήνα" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Αυτόν το χρόνο" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"Παρακαλώ εισάγετε το σωστό %(username)s και κωδικό για λογαριασμό " +"προσωπικού. Σημειώστε οτι και στα δύο πεδία μπορεί να έχει σημασία αν είναι " +"κεφαλαία ή μικρά. " -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Η συνεδρία σας έχει λήξει. Παρακαλούμε συνδεθείτε ξανά." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ενέργεια:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "ώρα ενέργειας" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "κωδικός αντικειμένου" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "αναπαράσταση αντικειμένου" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "σημαία ενέργειας" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "αλλαγή μηνύματος" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "εγγραφή καταγραφής" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "εγγραφές καταγραφής" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Προστέθηκαν \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Αλλάχθηκαν \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Διαγράφηκαν \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry Object" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Κανένα" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Έγινε επεξεργασία του %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "και" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Προστέθηκε %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Έγινε επεξεργασία %(list)s για %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Διαγράφη %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Κανένα πεδίο δεν άλλαξε." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,38 +183,44 @@ "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία. Μπορείτε να το " "επεξεργαστείτε πάλι παρακάτω." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" +"To %(name)s \"%(obj)s\" προστέθηκε επιτυχώς. Μπορείτε να προσθέσετε και άλλο " +"%(name)s παρακάτω." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Το %(name)s \"%(obj)s\" αποθηκεύτηκε με επιτυχία." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" +"Το %(name)s \"%(obj)s\" αλλάχθηκε επιτυχώς. Μπορείτε να το επεξεργαστείτε " +"ξανά παρακάτω." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" +"To %(name)s \"%(obj)s\" αλλάχθηκε επιτυχώς. Μπορείτε να προσθέσετε και άλλο " +"%(name)s παρακάτω." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Το %(name)s \"%(obj)s\" αλλάχτηκε με επιτυχία." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -216,268 +229,284 @@ "αντικείμενο. Πρέπει να επιλέξετε ένα ή περισσότερα αντικείμενα για να " "πραγματοποιήσετε ενέργειες σε αυτά." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Δεν έχει επιλεγεί ενέργεια." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Προσθήκη %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr " Το αντικείμενο %(name)s με πρωτεύον κλειδί %(key)r δεν βρέθηκε." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Προσθήκη %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Αλλαγή του %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Σφάλμα βάσης δεδομένων" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s άλλαξε επιτυχώς." msgstr[1] "%(count)s %(name)s άλλαξαν επιτυχώς." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Επιλέχθηκε %(total_count)s" msgstr[1] "Επιλέχθηκαν και τα %(total_count)s" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Επιλέγησαν 0 από %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Το %(name)s \"%(obj)s\" διαγράφηκε με επιτυχία." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ιστορικό αλλαγών: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Η διαγραφή %(class_name)s %(instance)s θα απαιτούσε την διαγραφή των " +"ακόλουθων προστατευόμενων συγγενεύων αντικειμένων: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Σύνδεση" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Διαχειριστής ιστότοπου Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Διαχείριση Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Διαχείριση του ιστότοπου" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Διαχείριση %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Ημ/νία:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Ώρα:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Αναζήτηση" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Προσθέστε κι άλλο" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Σύνδεση" -#: widgets.py:303 -msgid "Change:" -msgstr "" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Διαχείριση %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Η σελίδα δε βρέθηκε" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Λυπόμαστε, αλλά η σελίδα που ζητήθηκε δε μπόρεσε να βρεθεί." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Αρχική" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Σφάλμα εξυπηρετητή" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Σφάλμα εξυπηρετητή (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Σφάλμα εξυπηρετητή (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" +"Υπήρξε ένα σφάλμα. Έχει αναφερθεί στους διαχειριστές της σελίδας μέσω email, " +"και λογικά θα διορθωθεί αμεσα. Ευχαριστούμε για την υπομονή σας." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Εκτέλεση της επιλεγμένης ενέργειας" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Μετάβαση" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Κάντε κλικ εδώ για να επιλέξετε τα αντικείμενα σε όλες τις σελίδες" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Επιλέξτε και τα %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Καθαρισμός επιλογής" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Αρχικά εισάγετε το όνομα χρήστη και τον κωδικό πρόσβασης. Μετά την " +"ολοκλήρωση αυτού του βήματος θα έχετε την επιλογή να προσθέσετε όλα τα " +"υπόλοιπα στοιχεία για τον χρήστη." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Εισάγετε όνομα χρήστη και κωδικό πρόσβασης." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Αλλαγή συνθηματικού" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Παρακαλούμε διορθώστε το παρακάτω λάθος." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Παρακαλοϋμε διορθώστε τα παρακάτω λάθη." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Εισάγετε ένα νέο κωδικό πρόσβασης για τον χρήστη %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Συνθηματικό" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Συνθηματικό (ξανά)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Εισάγετε το ίδιο συνθηματικό όπως παραπάνω, για λόγους επιβεβαίωσης." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Καλωσήρθατε," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Τεκμηρίωση" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Αλλαγή συνθηματικού" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Αποσύνδεση" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Διαχειριστής ιστότοπου Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Διαχείριση Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Προσθήκη" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Ιστορικό" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Προβολή στην ιστοσελίδα" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Παρακαλούμε διορθώστε τα παρακάτω λάθη." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Προσθήκη %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Φίλτρο" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Διαγραφή από την ταξινόμηση" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Προτεραιότητα ταξινόμησης: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Εναλλαγή ταξινόμησης" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Διαγραφή" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -489,7 +518,7 @@ "για τα οποία δεν έχετε δικάιωμα διαγραφής. Τα είδη των αντικειμένων αυτών " "είναι:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -498,7 +527,7 @@ "Η διαγραφή του %(object_name)s '%(escaped_object)s' απαιτεί την διαγραφή " "των παρακάτω προστατευμένων αντικειμένων:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -508,16 +537,16 @@ "\"%(escaped_object)s\". Αν προχωρήσετε με την διαγραφή όλα τα παρακάτω " "συσχετισμένα αντικείμενα θα διαγραφούν επίσης:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ναι, είμαι βέβαιος" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Διαγραφή πολλών αντικειμένων" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -528,7 +557,7 @@ "διαγραφή συσχετισμένων αντικειμένων για τα οποία δεν έχετε το διακαίωμα " "διαγραφής:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -537,7 +566,7 @@ "Η διαγραφή των επιλεγμένων %(objects_name)s απαιτεί την διαγραφή των " "παρακάτω προστατευμένων αντικειμένων:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -547,41 +576,56 @@ "Αν προχωρήσετε με την διαγραφή όλα τα παρακάτω συσχετισμένα αντικείμενα θα " "διαγραφούν επίσης:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Αφαίρεση" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Προσθήκη νέου %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Θέλετε να πραγματοποιηθεί διαγραφή?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Ανά %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" -msgstr "" +msgstr "Μοντέλα στην εφαρμογή %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Επεξεργασία" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Δεν έχετε δικαίωμα να επεξεργαστείτε τίποτα." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Πρόσφατες ενέργειες" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Οι ενέργειες μου" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Κανένα διαθέσιμο" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Άγνωστο περιεχόμενο" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -591,27 +635,27 @@ "βεβαιωθείτε ότι οι απαραίτητοι πίνακες έχουν δημιουργηθεί και ότι η βάση " "είναι προσβάσιμη από τον αντίστοιχο χρήστη που έχετε δηλώσει." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Συνθηματικό:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Ξεχάσατε το συνθηματικό ή τον κωδικό χρήστη σας;" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Ημερομηνία/ώρα" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Χρήστης" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ενέργεια" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -619,115 +663,61 @@ "Δεν υπάρχει ιστορικό αλλαγών γι' αυτό το αντικείμενο. Είναι πιθανό η " "προσθήκη του να μην πραγματοποιήθηκε χρησιμοποιώντας το διαχειριστικό." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Εμφάνιση όλων" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Αποθήκευση" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Αναζήτηση" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s αποτέλεσμα" msgstr[1] "%(counter)s αποτελέσματα" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s συνολικά" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Αποθήκευση ως νέο" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Αποθήκευση και προσθήκη καινούριου" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Αποθήκευση και συνέχεια επεξεργασίας" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Αρχικά εισάγετε το όνομα χρήστη και τον κωδικό πρόσβασης. Μετά την " -"ολοκλήρωση αυτού του βήματος θα έχετε την επιλογή να προσθέσετε όλα τα " -"υπόλοιπα στοιχεία για τον χρήστη." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Εισάγετε όνομα χρήστη και κωδικό πρόσβασης." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Εισάγετε ένα νέο κωδικό πρόσβασης για τον χρήστη %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Συνθηματικό" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Συνθηματικό (ξανά)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Εισάγετε το ίδιο συνθηματικό όπως παραπάνω, για λόγους επιβεβαίωσης." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Αφαίρεση" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Προσθήκη νέου %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Θέλετε να πραγματοποιηθεί διαγραφή?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Ευχαριστούμε που διαθέσατε κάποιο ποιοτικό χρόνο στον ιστότοπο σήμερα." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Σύνδεση ξανά" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Αλλαγή συνθηματικού" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Επιτυχής αλλαγή συνθηματικού" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Το συνθηματικό σας έχει αλλαχτεί." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -736,48 +726,36 @@ "κατόπιν εισάγετε το νέο σας συνθηματικό δύο φορές ούτως ώστε να " "πιστοποιήσουμε ότι το πληκτρολογήσατε σωστά." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Προηγούμενος κωδικός πρόσβασης" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Νέος κωδικός πρόσβασης" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Αλλαγή του συνθηματικού μου" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Επαναφορά συνθηματικού" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Ολοκληρώθηκε η επαναφορά του κωδικού πρόσβασης." - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Ορίσατε επιτυχώς έναν κωδικό πρόσβασής. Πλέον έχετε την δυνατότητα να " "συνδεθήτε." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Επιβεβαίωση επαναφοράς κωδικού πρόσβασης" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Πληκτρολογήστε νέο συνθηματικό" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -785,19 +763,15 @@ "Παρακαλούμε πληκτρολογήστε το νέο κωδικό πρόσβασης δύο φορές ώστε να " "βεβαιωθούμε ότι δεν πληκτρολογήσατε κάποιον χαρακτήρα λανθασμένα." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Νέο συνθηματικό:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Επιβεβαίωση συνθηματικού:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Επαναφορά συνθηματικού ανεπιτυχής" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,79 +781,107 @@ "πραγματοποιήσετε και πάλι την διαδικασία αίτησης επαναφοράς του κωδικού " "πρόσβασης." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Επιτυχής επαναφορά συνθηματικού" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"Σας στείλαμε οδηγίες για να ρυθμίσετε τον κωδικό σας. Θα πρέπει να τις " +"λάβετε σύντομα." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Εάν δεν λάβετε email, παρακαλούμε σιγουρευτείτε οτί έχετε εισάγει την " +"διεύθυνση με την οποία έχετε εγγραφεί, και ελέγξτε τον φάκελο με τα " +"ανεπιθύμητα." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" +"Λαμβάνετε αυτό το email επειδή ζητήσατε επαναφορά κωδικού για τον λογαριασμό " +"σας στο %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" "Παρακαλούμε επισκεφθήτε την ακόλουθη σελίδα και επιλέξτε ένα νέο κωδικό " "πρόσβασης: " -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" "Το όνομα χρήστη με το οποίο είστε καταχωρημένος για την περίπτωση στην οποία " "το έχετε ξεχάσει:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Ευχαριστούμε που χρησιμοποιήσατε τον ιστότοπο μας!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Η ομάδα του %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"Ξεχάσατε τον κωδικό σας; Εισάγετε το email σας παρακάτω, και θα σας " +"αποστείλουμε οδηγίες για να ρυθμίσετε εναν καινούργιο." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "" +msgstr "Ηλεκτρονική διεύθυνση:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Επαναφορά του συνθηματικού μου" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Όλες οι ημερομηνίες" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Κενό)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Επιλέξτε %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Επιλέξτε %s προς αλλαγή" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Ημ/νία:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Ώρα:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Αναζήτηση" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Προσθέστε κι άλλο" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Τώρα:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Επεξεργασία:" diff -Nru python-django-1.6.6/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/en/LC_MESSAGES/djangojs.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-05-02 16:18+0200\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,153 +13,173 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/en/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/en/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/en/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/en/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/en/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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-05-25 14:19+0200\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -13,459 +13,469 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, suitable to be an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "" - -#: sites.py:386 -msgid "Site administration" -msgstr "" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "" - -#: widgets.py:91 -msgid "Time:" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" msgstr "" -#: widgets.py:165 -msgid "Lookup" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" msgstr "" -#: widgets.py:260 -msgid "Add Another" +#: contrib/admin/sites.py:42 +msgid "Site administration" msgstr "" -#: widgets.py:302 -msgid "Currently:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" msgstr "" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 -#, python-format -msgid "%(name)s" +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." msgstr "" -#: templates/admin/base.html:28 -msgid "Welcome," +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." msgstr "" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Documentation" +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" msgstr "" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." msgstr "" -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Log out" +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." msgstr "" -#: templates/admin/base_site.html:4 -msgid "Django site admin" +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." msgstr "" -#: templates/admin/base_site.html:7 -msgid "Django administration" +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" msgstr "" -#: templates/admin/change_form.html:22 templates/admin/index.html:33 -msgid "Add" +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" msgstr "" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 -msgid "History" +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." msgstr "" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 -msgid "View on site" +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" msgstr "" -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -473,30 +483,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -504,328 +514,297 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/en_AU/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/en_AU/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/en_AU/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/en_AU/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/en_AU/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/en_AU/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,193 @@ +# 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-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "Available %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "Type into this box to filter down the list of available %s." + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "Filter" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "Choose all" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "Click to choose all %s at once." + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "Choose" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "Remove" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "Chosen %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "Remove all" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "Click to remove all chosen %s at once." + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/en_AU/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/en_AU/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/en_AU/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/en_AU/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/en_AU/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/en_AU/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,826 @@ +# 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-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+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" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "Successfully deleted %(count)d %(items)s." + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "Cannot delete %(name)s" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "Are you sure?" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Delete selected %(verbose_name_plural)s" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "All" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "No" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "Unknown" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "Any date" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "Today" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "Past 7 days" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "This month" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "This year" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "Action:" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "action time" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "object id" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "object repr" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "action flag" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "change message" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "log entry" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "log entries" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "Added \"%(object)s\"." + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "Changed \"%(object)s\" - %(changes)s" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "Deleted \"%(object)s.\"" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "LogEntry Object" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "None" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "Changed %s." + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "and" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "Added %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "Changed %(list)s for %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "Deleted %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "No fields changed." + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "The %(name)s \"%(obj)s\" was added successfully." + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "The %(name)s \"%(obj)s\" was changed successfully." + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "No action selected." + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "%(name)s object with primary key %(key)r does not exist." + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Add %s" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "Change %s" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "Database error" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s was changed successfully." +msgstr[1] "%(count)s %(name)s were changed successfully." + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "%(total_count)s selected" +msgstr[1] "All %(total_count)s selected" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "0 of %(cnt)s selected" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/en_GB/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" "django/language/en_GB/)\n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Available %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Type into this box to filter down the list of available %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Choose all" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Click to choose all %s at once." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Choose" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Remove" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Chosen %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,22 +72,24 @@ "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Remove all" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Click to remove all chosen %s at once." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s of %(cnt)s selected" msgstr[1] "%(sel)s of %(cnt)s selected" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -95,7 +97,8 @@ "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "individual fields yet. Please click OK to save. You'll need to re-run the " "action." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -115,70 +119,86 @@ "fields. You're probably looking for the Go button rather than the Save " "button." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"January February March April May June July August September October November " -"December" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T W T F S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Show" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Hide" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Now" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Clock" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Choose a time" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Midnight" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Noon" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancel" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Today" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendar" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Yesterday" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Tomorrow" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"January February March April May June July August September October November " +"December" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T W T F S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Show" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Hide" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/en_GB/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/" "django/language/en_GB/)\n" @@ -18,194 +18,197 @@ "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Successfully deleted %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Cannot delete %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Are you sure?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Delete selected %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "All" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Yes" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Unknown" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Any date" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Today" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Past 7 days" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "This month" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "This year" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Please log in again, because your session has expired." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Action:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "action time" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "object id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "object repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "action flag" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "change message" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "log entry" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "log entries" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Added \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Changed \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Deleted \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry Object" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "None" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Changed %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "and" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Added %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Changed %(list)s for %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Deleted %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "No fields changed." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "The %(name)s \"%(obj)s\" was added successfully." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "The %(name)s \"%(obj)s\" was changed successfully." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -213,268 +216,277 @@ "Items must be selected in order to perform actions on them. No items have " "been changed." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "No action selected." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Add %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "The %(name)s \"%(obj)s\" was deleted successfully." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s object with primary key %(key)r does not exist." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Add %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Change %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Database error" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s was changed successfully." msgstr[1] "%(count)s %(name)s were changed successfully." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s selected" msgstr[1] "All %(total_count)s selected" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 of %(cnt)s selected" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "The %(name)s \"%(obj)s\" was deleted successfully." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Change history: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Log in" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django site admin" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administration" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Site administration" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administration" - -#: widgets.py:90 -msgid "Date:" -msgstr "Date:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Time:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Lookup" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Add Another" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Log in" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Page not found" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "We're sorry, but the requested page could not be found." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Home" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Server error" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Server error (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Server Error (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Run the selected action" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Go" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Click here to select the objects across all pages" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Select all %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Clear selection" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Enter a username and password." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Change password" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Please correct the errors below." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Enter a new password for the user %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Password" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Password (again)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Enter the same password as above, for verification." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Welcome," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentation" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Change password" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Log out" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django site admin" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administration" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Add" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "History" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "View on site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Please correct the errors below." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Add %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Remove from sorting" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorting priority: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Toggle sorting" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Delete" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -485,7 +497,7 @@ "related objects, but your account doesn't have permission to delete the " "following types of objects:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -494,7 +506,7 @@ "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -503,16 +515,16 @@ "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Yes, I'm sure" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Delete multiple objects" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -523,7 +535,7 @@ "objects, but your account doesn't have permission to delete the following " "types of objects:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -532,7 +544,7 @@ "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -541,41 +553,56 @@ "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Remove" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Add another %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Delete?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " By %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Change" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "You don't have permission to edit anything." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Recent Actions" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "My Actions" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "None available" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Unknown content" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -585,27 +612,27 @@ "database tables have been created, and make sure the database is readable by " "the appropriate user." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Password:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Forgotten your password or username?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Date/time" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "User" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Action" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -613,112 +640,61 @@ "This object doesn't have a change history. It probably wasn't added via this " "admin site." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Show all" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Save" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Search" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s result" msgstr[1] "%(counter)s results" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Save as new" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Save and add another" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Save and continue editing" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Enter a username and password." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Enter a new password for the user %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Password" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Password (again)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Enter the same password as above, for verification." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Remove" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Add another %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Delete?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Thanks for spending some quality time with the Web site today." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Log in again" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Password change" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Password change successful" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Your password was changed." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -726,46 +702,34 @@ "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Old password" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "New password" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Change my password" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Password reset" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Password reset complete" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Your password has been set. You may go ahead and log in now." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Password reset confirmation" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Enter new password" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -773,19 +737,15 @@ "Please enter your new password twice so we can verify you typed it in " "correctly." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "New password:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirm password:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Password reset unsuccessful" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -793,75 +753,94 @@ "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Password reset successful" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Please go to the following page and choose a new password:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Your username, in case you've forgotten:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Thanks for using our site!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "The %(site_name)s team" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Reset my password" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "All dates" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(None)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Select %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Select %s to change" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Date:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Time:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Lookup" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Add Another" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/eo/LC_MESSAGES/djangojs.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: -# Baptiste , 2012 +# Baptiste Darthenay , 2012 +# Baptiste Darthenay , 2014 # Jaffa McNeill , 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 14:03+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" @@ -19,12 +20,12 @@ "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Disponebla %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +35,38 @@ "ilin en la suba skatolo kaj tiam klakante la \"Elekti\" sagon inter la du " "skatoloj." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Entipu en ĉi-tiu skatolo por filtri la liston de haveblaj %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtru" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Elekti ĉiuj" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klaku por tuj elekti ĉiuj %s." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Elekti" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Forigu" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Elektita %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,22 +76,24 @@ "ilin en la suba skatolo kaj tiam klakante la \"Forigi\" sagon inter la du " "skatoloj." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Forigu ĉiujn" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klaku por tuj forigi ĉiujn %s elektitajn." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s elektita" msgstr[1] "%(sel)s de %(cnt)s elektitaj" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +101,8 @@ "Vi havas neŝirmitajn ŝanĝojn je unuopaj redakteblaj kampoj. Se vi faros " "agon, viaj neŝirmitaj ŝanĝoj perdiĝos." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -107,7 +111,8 @@ "Vi elektas agon, sed vi ne ŝirmis viajn ŝanĝojn al individuaj kampoj ĝis " "nun. Bonvolu klaku BONA por ŝirmi. Vi devos ripeton la agon" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,70 +121,86 @@ "Vi elektas agon, kaj vi ne faris ajnajn ŝanĝojn ĉe unuopaj kampoj. Vi " "verŝajne serĉas la Iru-butonon prefere ol la Ŝirmu-butono." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januaro Februaro Marto Aprilo Majo Junio Julio Aŭgusto Septembro Oktobro " -"Novembro Decembro" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M Ĵ V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Montru" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Kaŝu" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Noto: Vi estas %s horo antaŭ la servila horo." +msgstr[1] "Noto: Vi estas %s horoj antaŭ la servila horo." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Noto: Vi estas %s horo post la servila horo." +msgstr[1] "Noto: Vi estas %s horoj post la servila horo." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nun" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Horloĝo" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Elektu tempon" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Noktomezo" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.t.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Tagmezo" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Malmendu" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hodiaŭ" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendaro" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Hieraŭ" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Morgaŭ" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januaro Februaro Marto Aprilo Majo Junio Julio Aŭgusto Septembro Oktobro " +"Novembro Decembro" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M Ĵ V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Montru" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Kaŝu" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/eo/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/eo/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/eo/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/eo/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/eo/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,18 @@ # 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 # Dinu Gherman , 2011 # kristjan , 2012 -# 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-13 16:01+0000\n" -"Last-Translator: Baptiste \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 13:29+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" @@ -21,62 +21,68 @@ "Language: eo\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Sukcese forigis %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ne povas forigi %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ĉu vi certas?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Forigi elektitajn %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administrado" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Ĉio" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Jes" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nekonata" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Ajna dato" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hodiaŭ" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Lastaj 7 tagoj" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ĉi tiu monato" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ĉi tiu jaro" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,94 +91,91 @@ "Bonvolu eniri la ĝustan %(username)s-n kaj pasvorton por personara konto. " "Notu, ke ambaŭ kampoj povas esti usklecodistinga." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Bonvolu ensaluti denove, ĉar via seanco senvalidiĝis." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ago:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "aga tempo" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekta identigaĵo" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekta prezento" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "aga marko" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ŝanĝmesaĝo" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "protokolero" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "protokoleroj" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" aldonita." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Ŝanĝita \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Forigita \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Protokolera objekto" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Neniu" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Ŝanĝita %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "kaj" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Aldonita %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Ŝanĝita %(list)s por %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Forigita %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Neniu kampo ŝanĝita." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -180,7 +183,7 @@ "La %(name)s \"%(obj)s\" estis aldonita sukcese. Vi rajtas ĝin redakti denove " "sube." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +192,12 @@ "La %(name)s \"%(obj)s\" estis sukcese aldonita. Vi povas sube aldoni alian " "%(name)s-n." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "La %(name)s \"%(obj)s\" estis aldonita sukcese." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -203,7 +206,7 @@ "La %(name)s \"%(obj)s\" estis sukcese ŝanĝita. Vi povas sube redakti ĝin " "denove." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -212,12 +215,12 @@ "La %(name)s \"%(obj)s\" estis sukcese ŝanĝita. Vi povas sube aldoni alian " "%(name)s-n." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "La %(name)s \"%(obj)s\" estis ŝanĝita sukcese." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -225,66 +228,66 @@ "Elementoj devas esti elektitaj por elfari agojn sur ilin. Neniu elemento " "estis ŝanĝita." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Neniu ago elektita." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Aldoni %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "La %(name)s \"%(obj)s\" estis forigita sukcese." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objekto kun ĉefŝlosilo %(key)r ne ekzistas." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Aldoni %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Ŝanĝi %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Datumbaza eraro" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s estis sukcese ŝanĝita." msgstr[1] "%(count)s %(name)s estis sukcese ŝanĝitaj." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s elektitaj" msgstr[1] "Ĉiuj %(total_count)s elektitaj" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 el %(cnt)s elektita" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "La %(name)s \"%(obj)s\" estis forigita sukcese." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ŝanĝa historio: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -293,83 +296,71 @@ "Forigi la %(class_name)s-n “%(instance)s” postulus forigi la sekvajn " "protektitajn rilatajn objektojn: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Ensaluti" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Djanga reteja administrado" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Djanga administrado" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Reteja administrado" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administrado" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dato:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Horo:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Trarigardo" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Aldoni ankoraŭ unu" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Nuntempe:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Ensaluti" -#: widgets.py:303 -msgid "Change:" -msgstr "Ŝanĝo:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s administrado" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Paĝo ne trovita" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Bedaŭrinde la petitan paĝon ne povas esti trovita." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Ĉefpaĝo" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Servila eraro" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Servila eraro (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Servila eraro (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -377,120 +368,141 @@ "Okazis eraro. Ĝi estis raportita al la retejaj administrantoj tra retpoŝto " "kaj baldaŭ devus esti riparita. Dankon por via pacienco." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Lanĉi la elektita agon" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ek" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klaku ĉi-tie por elekti la objektojn trans ĉiuj paĝoj" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Elekti ĉiuj %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Viŝi elekton" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Unue, bovolu tajpi salutnomon kaj pasvorton. Tiam, vi povos redakti pli da " +"uzantaj agordoj." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Enigu salutnomon kaj pasvorton." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Ŝanĝi pasvorton" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Bonvolu ĝustigi la erarojn sube." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Bonvolu ĝustigi la erarojn sube." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Enigu novan pasvorton por la uzanto %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Pasvorto" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Pasvorto (denove)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Entajpu la saman pasvorton kiel supre, por konfirmo." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bonvenon," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentaro" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Ŝanĝi pasvorton" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Elsaluti" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Djanga reteja administrado" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Djanga administrado" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Aldoni" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historio" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Vidi sur retejo" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Bonvolu ĝustigi la erarojn sube." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Bonvolu ĝustigi la erarojn sube." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Aldoni %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtri" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Forigi el ordigado" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Ordiga prioritato: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Ŝalti ordigadon" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Forigi" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -501,7 +513,7 @@ "rilatajn objektojn, sed via konto ne havas permeson por forigi la sekvantajn " "tipojn de objektoj:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -510,7 +522,7 @@ "Forigi la %(object_name)s '%(escaped_object)s' postulus forigi la sekvajn " "protektitajn rilatajn objektojn:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -519,16 +531,16 @@ "Ĉu vi certas, ke vi volas forigi %(object_name)s \"%(escaped_object)s\"? " "Ĉiuj el la sekvaj rilataj eroj estos forigitaj:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Jes, mi certas" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Forigi plurajn objektojn" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -538,7 +550,7 @@ "Forigi la %(objects_name)s rezultus en forigi rilatajn objektojn, sed via " "konto ne havas permeson por forigi la sekvajn tipojn de objektoj:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -547,7 +559,7 @@ "Forigi la %(objects_name)s postulus forigi la sekvajn protektitajn rilatajn " "objektojn:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -556,41 +568,56 @@ "Ĉu vi certas, ke vi volas forigi la elektitajn %(objects_name)s? Ĉiuj el la " "sekvaj objektoj kaj iliaj rilataj eroj estos forigita:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Forigu" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Aldoni alian %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Forviŝi?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Laŭ %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modeloj en la %(name)s aplikaĵo" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Ŝanĝi" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Vi ne havas permeson por redakti ĉion ajn." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Lastaj agoj" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Miaj agoj" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Neniu disponebla" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Nekonata enhavo" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -600,27 +627,27 @@ "de datumbazo estis kreitaj, kaj ke la datumbazo estas legebla per la ĝusta " "uzanto." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Pasvorto:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Ĉu vi forgesis vian pasvorton aŭ salutnomo?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dato/horo" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Uzanto" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ago" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -628,112 +655,61 @@ "Ĉi tiu objekto ne havas ŝanĝ-historion. Eble ĝi ne estis aldonita per la " "administranta retejo." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Montri ĉion" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Konservi" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Serĉu" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resulto" msgstr[1] "%(counter)s resultoj" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s entute" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Konservi kiel novan" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Konservi kaj aldoni alian" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Konservi kaj daŭre redakti" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Unue, bovolu tajpi salutnomon kaj pasvorton. Tiam, vi povos redakti pli da " -"uzantaj agordoj." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Enigu salutnomon kaj pasvorton." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Enigu novan pasvorton por la uzanto %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Pasvorto" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Pasvorto (denove)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Entajpu la saman pasvorton kiel supre, por konfirmo." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Forigu" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Aldoni alian %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Forviŝi?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Dankon pro pasigo de kvalita tempon kun la retejo hodiaŭ." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Ensaluti denove" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Pasvorta ŝanĝo" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Pasvorto sukcese ŝanĝita" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Via pasvorto estis sukcese ŝanĝita." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -741,46 +717,34 @@ "Bonvolu enigi vian malnovan pasvorton, pro sekureco, kaj tiam enigi vian " "novan pasvorton dufoje, tiel ni povas konfirmi ke vi ĝuste tajpis ĝin." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Malnova pasvorto" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nova pasvorto" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Ŝanĝi mian passvorton" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Pasvorta rekomencigo" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Pasvorta rekomencigo plenumita" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Via pasvorto estis ŝanĝita. Vi povas iri antaŭen kaj ensaluti nun." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Pasvorta rekomenciga konfirmo" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Enigu novan pasvorton" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -788,19 +752,15 @@ "Bonvolu entajpi vian novan pasvorton dufoje, tiel ni povas konfirmi ke vi " "ĝuste tajpis ĝin." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nova pasvorto:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Konfirmi pasvorton:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Pasvorta rekomencigo malsuksesis" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -808,12 +768,7 @@ "La pasvorta rekomenciga ligo malvalidis, eble ĉar ĝi jam estis uzata. " "Bonvolu peti novan pasvortan rekomencigon." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Pasvorta rekomencigo suksesis" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -821,7 +776,7 @@ "Ni retpoŝte sendis al vi instrukciojn por agordi la pasvorton al la retpoŝto " "vi sendis. Vi baldaŭ devus ĝin ricevi." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -829,7 +784,7 @@ "Se vi ne ricevas retpoŝton, bonvolu certigi vin eniris la adreson kun kiu vi " "registris, kaj kontroli vian spaman dosierujon." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -838,24 +793,24 @@ "Vi ricevis ĉi tiun retpoŝton ĉar vi petis pasvortan rekomencigon por via " "uzanta konto ĉe %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Bonvolu iri al la sekvanta paĝo kaj elekti novan pasvorton:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Via salutnomo, se vi forgesis:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Dankon pro uzo de nia retejo!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "La %(site_name)s teamo" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -863,28 +818,52 @@ "Vi forgesis vian pasvorton? Malsupre enigu vian retpoŝtan adreson kaj ni " "retpoŝte sendos instrukciojn por agordi novan." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Retpoŝto:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Rekomencigi mian pasvorton" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Ĉiuj datoj" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Neniu)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Elekti %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Elekti %s por ŝanĝi" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dato:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Horo:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Trarigardo" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Aldoni ankoraŭ unu" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Nuntempe:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ŝanĝo:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,15 @@ # Translators: # Antoni Aloy , 2011-2012 # Jannis Leidel , 2011 +# Josue Naaman Nistal Guerra , 2014 # Leonardo J. Caballero G. , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 18:51+0000\n" +"Last-Translator: Josue Naaman Nistal Guerra \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -19,12 +20,12 @@ "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s Disponibles" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +35,38 @@ "en la caja inferior y luego haciendo clic en la flecha \"Elegir\" que hay " "entre las dos cajas." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Escribe en este cuadro para filtrar la lista de %s disponibles" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Selecciona todos" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Haz clic para seleccionar todos los %s de una vez" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Elegir" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Remover" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s Elegidos" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,22 +76,24 @@ "seleccionándolos en la caja inferior y luego haciendo click en la flecha " "\"Eliminar\" que hay entre las dos cajas." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Eliminar todos" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Haz clic para eliminar todos los %s elegidos" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s seleccionado" msgstr[1] "%(sel)s de %(cnt)s seleccionados" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +101,8 @@ "Tienes cambios sin guardar en campos editables individuales. Si ejecutas una " "acción, los cambios no guardados se perderán." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +112,8 @@ "individuales todavía. Pulsa OK para guardar. Tendrás que volver a ejecutar " "la acción." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -118,70 +123,86 @@ "individuales. Probablemente estés buscando el botón Ejecutar en lugar del " "botón Guardar." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre " -"Noviembre Diciembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M J V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Esconder" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Nota: Usted esta a %s horas por delante de la hora del servidor." +msgstr[1] "Nota: Usted esta a %s horas antes de la hora del servidor." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Nota: Usted esta a %s hora de retraso de tiempo de servidor." +msgstr[1] "Nota: Usted esta a %s horas detrás de la hora del servidor." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Ahora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Reloj" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Elige una hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Medianoche" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mediodía" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancelar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hoy" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendario" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ayer" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Mañana" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Septiembre Octubre " +"Noviembre Diciembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M J V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Esconder" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/es/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/es/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,19 +1,22 @@ # This file is distributed under the same license as the Django package. # # Translators: +# abraham.martin , 2014 # Antoni Aloy , 2011-2013 +# Claude Paroz , 2014 # franchukelly , 2011 # guillem , 2012 # Igor Támara , 2013 # Jannis Leidel , 2011 +# Josue Naaman Nistal Guerra , 2014 # Marc Garcia , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-09-04 20:35+0000\n" -"Last-Translator: Antoni Aloy \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-19 10:45+0000\n" +"Last-Translator: abraham.martin \n" "Language-Team: Spanish (http://www.transifex.com/projects/p/django/language/" "es/)\n" "MIME-Version: 1.0\n" @@ -22,62 +25,68 @@ "Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Eliminado/s %(count)d %(items)s satisfactoriamente." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "No se puede eliminar %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "¿Está seguro?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar %(verbose_name_plural)s seleccionado/s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administración" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Todo" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sí" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Desconocido" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Cualquier fecha" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hoy" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últimos 7 días" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Este mes" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Este año" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -86,101 +95,98 @@ "Por favor introduce el %(username)s y la clave correctos para una cuenta de " "personal. Observa que campos pueden ser sensibles a mayúsculas." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Por favor, inicie sesión de nuevo, ya que su sesión ha caducado." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Acción:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora de acción" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" -msgstr "id de objeto" +msgstr "id del objeto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" -msgstr "repr de objeto" +msgstr "repr del objeto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "marca de acción" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "mensaje de cambio" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada de registro" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entradas de registro" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Añadidos \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Cambiados \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Eliminados \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objeto de registro de Log" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ninguno" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modificado/a %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "y" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Añadido/a \"%(object)s\" %(name)s." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificados %(list)s para \"%(object)s\" %(name)s." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eliminado/a \"%(object)s\" %(name)s." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "No ha cambiado ningún campo." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "Se añadió con éxito el %(name)s \"%(obj)s. Puede editarlo de nuevo abajo." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +195,12 @@ "El %(name)s \"%(obj)s\" fue añadido satisfactoriamente. Puedes añadir otro " "%(name)s a continuación." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se añadió con éxito el %(name)s \"%(obj)s\"." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -203,7 +209,7 @@ "El %(name)s \"%(obj)s\" fue cambiado satisfactoriamente. Puedes editarlo " "otra vez a continuación." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -212,12 +218,12 @@ "El %(name)s \"%(obj)s\" fue cambiado satisfactoriamente. Puedes añadir otro " "%(name)s a continuación." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito el %(name)s \"%(obj)s\"." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -225,151 +231,139 @@ "Se deben seleccionar elementos para poder realizar acciones sobre estos. No " "se han modificado elementos." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "No se seleccionó ninguna acción." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Añadir %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existe ningún objeto %(name)s con la clave primaria %(key)r." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Añadir %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Error en la base de datos" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s fué modificado con éxito." msgstr[1] "%(count)s %(name)s fueron modificados con éxito." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionado" msgstr[1] "Todos %(total_count)s seleccionados" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "seleccionados 0 de %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se eliminó con éxito el %(name)s \"%(obj)s\"." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Histórico de modificaciones: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"La eliminación de %(object_name)s %(escaped_object)s requeriría eliminar los " -"siguientes objetos relacionados protegidos:" +"La eliminación de %(class_name)s %(instance)s requeriría eliminar los " +"siguientes objetos relacionados protegidos: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Iniciar sesión" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Sitio de administración de Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administración de Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Sitio administrativo" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administración de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Fecha:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Buscar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Añadir otro" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Actualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Iniciar sesión" -#: widgets.py:303 -msgid "Change:" -msgstr "Cambiar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s administracion" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Página no encontrada" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Lo sentimos, pero no se encuentra la página solicitada." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Inicio" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Error del servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Error del servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Error de servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -378,120 +372,143 @@ "electrónico y debería solucionarse a la mayor brevedad. Gracias por tu " "paciencia y comprensión." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Ejecutar la acción seleccionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ir" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Pulse aquí para seleccionar los objetos a través de todas las páginas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seleccionar todos los %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Limpiar selección" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar " +"el resto de opciones del usuario." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Entre un nombre de usuario y contraseña" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cambiar contraseña" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Introduzca una nueva contraseña para el usuario %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Contraseña" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Contraseña (de nuevo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Introduzca la misma contraseña que arriba, para verificación." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bienvenido/a," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentación" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cambiar contraseña" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Terminar sesión" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Sitio de administración de Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administración de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Añadir" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Histórico" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ver en el sitio" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Por favor, corrija los siguientes errores." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Por favor, corrija los siguientes errores." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Añadir %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtro" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Elimina de la ordenación" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioridad de la ordenación: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Activar la ordenación" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -502,7 +519,7 @@ "de objetos relacionados, pero su cuenta no tiene permiso para borrar los " "siguientes tipos de objetos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -511,7 +528,7 @@ "La eliminación de %(object_name)s %(escaped_object)s requeriría eliminar los " "siguientes objetos relacionados protegidos:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -520,16 +537,16 @@ "¿Está seguro de que quiere borrar los %(object_name)s \"%(escaped_object)s" "\"? Se borrarán los siguientes objetos relacionados:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sí, estoy seguro" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Eliminar múltiples objetos." -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -540,7 +557,7 @@ "objetos relacionados, pero su cuenta no tiene permisos para borrar los " "siguientes tipos de objetos:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -549,7 +566,7 @@ "La eliminación de %(objects_name)s seleccionado requeriría el borrado de los " "siguientes objetos protegidos relacionados:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -558,41 +575,56 @@ "¿Está usted seguro que quiere eliminar el %(objects_name)s seleccionado? " "Todos los siguientes objetos y sus elementos relacionados serán borrados:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Agregar %(verbose_name)s adicional." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "¿Eliminar?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Por %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelos en la aplicación %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "No tiene permiso para editar nada." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Acciones recientes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mis acciones" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ninguno disponible" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contenido desconocido" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -602,27 +634,27 @@ "necesarias han sido creadas, y que la base de datos puede ser leída por el " "usuario apropiado." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Contraseña:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "¿Olvidaste la contraseña o el nombre de usuario?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Fecha/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usuario" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Acción" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -630,114 +662,61 @@ "Este objeto no tiene histórico de cambios. Probablemente no fue añadido " "usando este sitio de administración." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostrar todo" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Grabar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Buscar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultado" msgstr[1] "%(counter)s resultados" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Grabar como nuevo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Grabar y añadir otro" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Grabar y continuar editando" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primero introduzca un nombre de usuario y una contraseña. Luego podrá editar " -"el resto de opciones del usuario." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Entre un nombre de usuario y contraseña" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Introduzca una nueva contraseña para el usuario %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Contraseña" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Contraseña (de nuevo)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Introduzca la misma contraseña que arriba, para verificación." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Eliminar" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Agregar %(verbose_name)s adicional." - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "¿Eliminar?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Gracias por el tiempo que ha dedicado hoy al sitio web." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Iniciar sesión de nuevo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cambio de contraseña" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Cambio de contraseña exitoso" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Su contraseña ha sido cambiada." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -746,48 +725,36 @@ "introduzca la nueva contraseña dos veces para verificar que la ha escrito " "correctamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Contraseña antigua" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Contraseña nueva" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Cambiar mi contraseña" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Restablecer contraseña" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Restablecimiento de contraseña completado" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Su contraseña ha sido establecida. Ahora puede seguir adelante e iniciar " "sesión." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmación de restablecimiento de contraseña" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Introduzca una nueva contraseña" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -795,19 +762,15 @@ "Por favor, introduzca su contraseña nueva dos veces para verificar que la ha " "escrito correctamente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Contraseña nueva:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirme contraseña:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Restablecimiento de contraseña fallido" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -816,12 +779,7 @@ "haberse utilizado previamente. Por favor, solicite un nuevo restablecimiento " "de contraseña." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Restablecimiento de contraseña exitoso" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -830,7 +788,7 @@ "la contraseña a la dirección de correo que indicó. Debería recibirlas en " "breve." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -838,7 +796,7 @@ "Si no recibe un correo, por favor asegúrese que ha introducido la dirección " "de correo con la que se registró y verifique su carpeta de spam." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -847,24 +805,24 @@ "Recibes este correo electrónico porqué has solicitado restablecer tu clave " "para tu cuenta en %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Por favor, vaya a la página siguiente y escoja una nueva contraseña." -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Su nombre de usuario, en caso de haberlo olvidado:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "¡Gracias por usar nuestro sitio!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -873,28 +831,52 @@ "enviaremos por correo electrónico las instrucciones para establecer una " "nueva." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Correo electrónico:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Restablecer mi contraseña" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Todas las fechas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nada)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Escoja %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Escoja %s a modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Fecha:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Buscar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Añadir otro" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Actualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Cambiar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es_AR/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,13 +2,14 @@ # # Translators: # Jannis Leidel , 2011 +# Ramiro Morales , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-03 10:49+0000\n" +"Last-Translator: Ramiro Morales \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/" "django/language/es_AR/)\n" "MIME-Version: 1.0\n" @@ -17,12 +18,12 @@ "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s disponibles" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +33,38 @@ "as en el cuadro de abajo y luego haciendo click en la flecha \"Seleccionar\" " "ubicada entre las dos listas." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Escriba en esta caja para filtrar la lista de %s disponibles." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Seleccionar todos/as" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Haga click para seleccionar todos/as los/as %s." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Seleccionar" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Eliminar" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s seleccionados/as" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +74,24 @@ "activándolos en la lista de abajo y luego haciendo click en la flecha " "\"Eliminar\" ubicada entre las dos listas." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Eliminar todos/as" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Haga clic para deselecionar todos/as los/as %s." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s seleccionado/a" msgstr[1] "%(sel)s de %(cnt)s seleccionados/as" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +99,8 @@ "Tiene modificaciones sin guardar en campos modificables individuales. Si " "ejecuta una acción las mismas se perderán." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +110,8 @@ "que ha realizado en campos individuales. Por favor haga click en Aceptar " "para grabarlas. Necesitará ejecutar la acción nuevamente." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,70 +121,94 @@ "campos individuales. Es probable que lo que necesite usar en realidad sea el " "botón Ejecutar y no el botón Guardar." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Setiembre Octubre " -"Noviembre Diciembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M J V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ocultar" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +"Nota: Ud. se encuentra en una zona horaria que está %s hora adelantada " +"respecto a la del servidor." +msgstr[1] "" +"Nota: Ud. se encuentra en una zona horaria que está %s horas adelantada " +"respecto a la del servidor." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +"Nota: Ud. se encuentra en una zona horaria que está %s hora atrasada " +"respecto a la del servidor." +msgstr[1] "" +"Nota: Ud. se encuentra en una zona horaria que está %s horas atrasada " +"respecto a la del servidor." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Ahora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Reloj" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Elija una hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Medianoche" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mediodía" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancelar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hoy" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendario" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ayer" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Mañana" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Setiembre Octubre " +"Noviembre Diciembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M J V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ocultar" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es_AR/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# ljguzman , 2013 -# Ramiro Morales , 2013 +# Leonardo José Guzmán , 2013 +# 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-05 09:34+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-03 10:42+0000\n" "Last-Translator: Ramiro Morales \n" "Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/" "django/language/es_AR/)\n" @@ -19,62 +19,68 @@ "Language: es_AR\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Se eliminaron con éxito %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "No se puede eliminar %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "¿Está seguro?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar %(verbose_name_plural)s seleccionados/as" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administración" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Todos/as" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sí" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Desconocido" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Cualquier fecha" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hoy" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últimos 7 días" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Este mes" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Este año" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,102 +90,97 @@ "staff. Note que puede que ambos campos sean estrictos en relación a " "diferencias entre mayúsculas y minúsculas." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Por favor, identifíquese de nuevo porque su sesión ha caducado." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Acción:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora de la acción" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id de objeto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr de objeto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "marca de acción" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "mensaje de cambio" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada de registro" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entradas de registro" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Se agrega \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Se modifica \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Se elimina \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objeto LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ninguno" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modifica %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "y" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Se agregó %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Se modificaron %(list)s en %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Se eliminó %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "No ha modificado ningún campo." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "" -"Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente " -"abajo." +msgstr "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a abajo." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +188,12 @@ msgstr "" "Se agregó con éxito %(name)s \"%(obj)s\". Puede agregar otro %(name)s abajo." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se agregó con éxito %(name)s \"%(obj)s\"." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +202,7 @@ "Se modificó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente " "abajo." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +211,12 @@ "Se modificó con éxito %(name)s \"%(obj)s\". Puede agregar otro %(name)s " "abajo." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito %(name)s \"%(obj)s\"." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,66 +224,66 @@ "Deben existir items seleccionados para poder realizar acciones sobre los " "mismos. No se modificó ningún item." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "No se ha seleccionado ninguna acción." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Agregar %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existe un objeto %(name)s con una clave primaria %(key)r." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Agregar %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Error de base de datos" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "Se ha modificado con éxito %(count)s %(name)s." msgstr[1] "Se han modificado con éxito %(count)s %(name)s." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionados/as" msgstr[1] "Todos/as (%(total_count)s en total) han sido seleccionados/as" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionados/as" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historia de modificaciones: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -291,83 +292,71 @@ "La eliminación de %(class_name)s %(instance)s provocaría la eliminación de " "los siguientes objetos relacionados protegidos: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Identificarse" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Administración de sitio Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administración de Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administración de sitio" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administración de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Fecha:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Buscar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Agregar otro/a" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Actualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Identificarse" -#: widgets.py:303 -msgid "Change:" -msgstr "Cambiar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Administración de %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Página no encontrada" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Lo sentimos, pero no se encuentra la página solicitada." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Inicio" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Error del servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Error del servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Error de servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -376,120 +365,144 @@ "sitio vía email y debería ser solucionado en breve. Le damos gracias por su " "paciencia." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Ejecutar la acción seleccionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ejecutar" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Haga click aquí para seleccionar los objetos de todas las páginas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seleccionar lo(s)/a(s) %(total_count)s %(module_name)s existentes" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Borrar selección" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primero introduzca un nombre de usuario y una contraseña. Luego podrá " +"configurar opciones adicionales acerca del usuario." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Introduzca un nombre de usuario y una contraseña." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cambiar contraseña" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Por favor corrija los errores detallados abajo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Introduzca una nueva contraseña para el usuario %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Contraseña" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Contraseña (de nuevo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" +"Para verificación, introduzca la misma contraseña que introdujo arriba." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bienvenido/a," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentación" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cambiar contraseña" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Cerrar sesión" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administración de sitio Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administración de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Agregar" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ver en el sitio" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Por favor, corrija los siguientes errores." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Por favor corrija los errores detallados abajo." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Agregar %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrar" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Remover de ordenamiento" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioridad de ordenamiento: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "(des)activar ordenamiento" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -500,7 +513,7 @@ "de objetos relacionados, pero su cuenta no tiene permiso para eliminar los " "siguientes tipos de objetos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -509,7 +522,7 @@ "Eliminar los %(object_name)s '%(escaped_object)s' requeriría eliminar " "también los siguientes objetos relacionados protegidos:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -518,16 +531,16 @@ "¿Está seguro de que desea eliminar los %(object_name)s \"%(escaped_object)s" "\"? Se eliminarán los siguientes objetos relacionados:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sí, estoy seguro" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Eliminar múltiples objetos" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -539,7 +552,7 @@ "no tiene los permisos necesarios para eliminar los siguientes tipos de " "objetos:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -548,7 +561,7 @@ "Eliminar el/los objetos %(objects_name)s seleccionados requeriría eliminar " "también los siguientes objetos relacionados protegidos:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -558,41 +571,56 @@ "los siguientes objetos e items relacionados a los mismos también serán " "eliminados:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Agregar otro/a %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "¿Eliminar?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Por %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelos en la aplicación %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "No tiene permiso para editar nada." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Acciones recientes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mis acciones" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ninguna disponible" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contenido desconocido" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -602,27 +630,27 @@ "tablas de la misma hayan sido creadas, y asegúrese de que el usuario " "apropiado tenga permisos de lectura en la base de datos." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Contraseña:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "¿Olvidó su contraseña o nombre de usuario?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Fecha/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usuario" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Acción" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -630,115 +658,61 @@ "Este objeto no tiene historia de modificaciones. Probablemente no fue " "añadido usando este sitio de administración." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostrar todos/as" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Guardar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Buscar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultado" msgstr[1] "%(counter)s resultados" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "total: %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Guardar como nuevo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Guardar y agregar otro" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Guardar y continuar editando" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primero introduzca un nombre de usuario y una contraseña. Luego podrá " -"configurar opciones adicionales acerca del usuario." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Introduzca un nombre de usuario y una contraseña." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Introduzca una nueva contraseña para el usuario %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Contraseña" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Contraseña (de nuevo)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" -"Para verificación, introduzca la misma contraseña que introdujo arriba." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Eliminar" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Agregar otro/a %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "¿Eliminar?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Identificarse de nuevo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cambio de contraseña" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Cambio de contraseña exitoso" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Su contraseña ha sido cambiada." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -747,46 +721,34 @@ "antigua y luego introduzca la nueva contraseña dos veces para verificar que " "la ha escrito correctamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Contraseña antigua" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Contraseña nueva" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Cambiar mi contraseña" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Recuperar contraseña" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Reinicialización de contraseña completada" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Su contraseña ha sido cambiada. Ahora puede continuar e ingresar." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmación de reincialización de contraseña" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Introduzca la nueva contraseña" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -794,19 +756,15 @@ "Por favor introduzca su nueva contraseña dos veces de manera que podamos " "verificar que la ha escrito correctamente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Contraseña nueva:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirme contraseña:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Reinicialización de contraseña fallida" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -815,12 +773,7 @@ "a que ya ha sido usado. Por favor solicite una nueva reinicialización de " "contraseña." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Recuperación de contraseña exitosa" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -828,7 +781,7 @@ "Se le han enviado intrucciones sobre como establecer su contraseña. Debería " "recibir las mismas pronto." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -837,7 +790,7 @@ "dirección de correo con la que se había registrado y verifique su carpeta de " "Correo no deseado." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -846,26 +799,26 @@ "Le enviamos este email porque Ud. ha solicitado que se reestablezca la " "contraseña para su cuenta de usuario en %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" "Por favor visite la página que se muestra a continuación y elija una nueva " "contraseña:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Su nombre de usuario, en caso de haberlo olvidado:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "¡Gracias por usar nuestro sitio!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -873,28 +826,52 @@ "¿Olvidó su contraseña? Introduzca su dirección de email abajo y le " "enviaremos instrucciones para establecer una nueva." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Dirección de email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Recuperar mi contraseña" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Todas las fechas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ninguno/a)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Seleccione %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Seleccione %s a modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Fecha:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Buscar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Agregar otro/a" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Actualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Cambiar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es_MX/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Abraham Estrada , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" @@ -17,12 +17,12 @@ "Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Disponible %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "seleccionándolos en el cuadro de abajo y haciendo click en la flecha " "\"Seleccionar\" entre las dos cajas." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Escriba en esta casilla para filtrar la lista de %s disponibles." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Seleccionar todos" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Da click para seleccionar todos los %s de una vez." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Seleccionar" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Quitar" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s seleccionados" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "seleccionándolos en el cuadro de abajo y haciendo click en la flecha " "\"Eliminar\" entre las dos cajas." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Eliminar todos" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Da click para eliminar todos los %s seleccionados de una vez." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s seleccionado/a" msgstr[1] "%(sel)s de %(cnt)s seleccionados/as" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "Tiene modificaciones sin guardar en campos modificables individuales. Si " "ejecuta una acción las mismas se perderán." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +109,8 @@ "que ha realizado en campos individuales. Por favor haga click en Aceptar " "para grabarlas. Necesitará ejecutar la acción nuevamente." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,70 +120,86 @@ "campos individuales. Es probable que lo que necesite usar en realidad sea el " "botón Ejecutar y no el botón Guardar." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Setiembre Octubre " -"Noviembre Diciembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M J V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ocultar" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Ahora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Reloj" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Elija una hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Medianoche" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mediodía" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancelar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hoy" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendario" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ayer" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Mañana" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Enero Febrero Marzo Abril Mayo Junio Julio Agosto Setiembre Octubre " +"Noviembre Diciembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M J V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ocultar" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es_MX/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Abraham Estrada , 2011-2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 21:49+0000\n" -"Last-Translator: Abraham Estrada \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+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" @@ -17,62 +17,68 @@ "Language: es_MX\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Se eliminaron con éxito %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "No se puede eliminar %(name)s " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "¿Está seguro?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eliminar %(verbose_name_plural)s seleccionados/as" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Todos/as" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sí" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Desconocido" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Cualquier fecha" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hoy" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últimos 7 días" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Este mes" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Este año" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -82,94 +88,91 @@ "staff. Note que puede que ambos campos sean estrictos en relación a " "diferencias entre mayúsculas y minúsculas." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Por favor, identifíquese de nuevo porque su sesión ha expirado." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Acción:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora de la acción" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id de objeto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr de objeto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "marca de acción" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "mensaje de cambio" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada de registro" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entradas de registro" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Añadidos \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Modificados \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Eliminados \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objeto de registro de Log" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ninguno" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modifica %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "y" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Se agregó %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Se modificaron %(list)s en %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Se eliminó %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "No ha modificado ningún campo." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -177,7 +180,7 @@ "Se agregó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente " "abajo." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -185,12 +188,12 @@ msgstr "" "Se agregó con éxito %(name)s \"%(obj)s\". Puede agregar otro %(name)s abajo." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Se agregó con éxito %(name)s \"%(obj)s\"." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -199,7 +202,7 @@ "Se modificó con éxito %(name)s \"%(obj)s\". Puede modificarlo/a nuevamente " "abajo." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -208,12 +211,12 @@ "Se modificó con éxito %(name)s \"%(obj)s\". Puede agregar otro %(name)s " "abajo." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Se modificó con éxito %(name)s \"%(obj)s\"." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -221,66 +224,66 @@ "Deben existir items seleccionados para poder realizar acciones sobre los " "mismos. No se modificó ningún item." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "No se ha seleccionado ninguna acción." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Agregar %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "No existe un objeto %(name)s con una clave primaria %(key)r." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Agregar %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Error en la base de datos" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "Se ha modificado con éxito %(count)s %(name)s." msgstr[1] "Se han modificado con éxito %(count)s %(name)s." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionados/as" msgstr[1] "Todos/as (%(total_count)s en total) han sido seleccionados/as" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionados/as" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Se eliminó con éxito %(name)s \"%(obj)s\"." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historia de modificaciones: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -289,83 +292,71 @@ "La eliminación de %(class_name)s %(instance)s provocaría la eliminación de " "los siguientes objetos relacionados protegidos: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Identificarse" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Sitio de administración de Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administración de Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administración del sitio" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administración de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Fecha:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Buscar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Agregar otro/a" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Actualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Identificarse" -#: widgets.py:303 -msgid "Change:" -msgstr "Modificar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Página no encontrada" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Lo sentimos, pero no se encuentra la página solicitada." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Inicio" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Error del servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Error del servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Error de servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -373,120 +364,143 @@ "Ha habido un error. Se ha informado a los administradores del sitio a través " "de correo electrónico y debe ser reparado en breve. Gracias por su paciencia." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Ejecutar la acción seleccionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ejecutar" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Haga click aquí para seleccionar los objetos de todas las páginas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seleccionar lo(s)/a(s) %(total_count)s de %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Borrar selección" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primero introduzca un nombre de usuario y una contraseña. Luego podrá " +"configurar opciones adicionales acerca del usuario." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Introduzca un nombre de usuario y una contraseña." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cambiar contraseña" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Por favor, corrija los siguientes errores." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Introduzca una nueva contraseña para el usuario %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Contraseña" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Contraseña (de nuevo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Para verificar, introduzca la misma contraseña que introdujo arriba." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bienvenido," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentación" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cambiar contraseña" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Cerrar sesión" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Sitio de administración de Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administración de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Agregar" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ver en el sitio" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Por favor, corrija los siguientes errores." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Por favor, corrija los siguientes errores." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Agregar %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrar" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Elimina de la clasificación" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioridad de la clasificación: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Activar la clasificación" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -497,7 +511,7 @@ "de objetos relacionados, pero su cuenta no tiene permiso para eliminar los " "siguientes tipos de objetos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -506,7 +520,7 @@ "Para eliminar %(object_name)s '%(escaped_object)s' requiere eliminar los " "siguientes objetos relacionados protegidos:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -515,16 +529,16 @@ "¿Está seguro de que quiere eliminar los %(object_name)s \"%(escaped_object)s" "\"? Se eliminarán los siguientes objetos relacionados:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sí, estoy seguro" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Eliminar múltiples objetos" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -535,7 +549,7 @@ "pero tu cuenta no tiene permisos para eliminar los siguientes tipos de " "objetos:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -544,7 +558,7 @@ "Eliminar el seleccionado %(objects_name)s requiere eliminar los siguientes " "objetos relacionados protegidas:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -553,41 +567,56 @@ "¿Está seguro que desea eliminar el seleccionado %(objects_name)s ? Todos los " "objetos siguientes y sus elementos asociados serán eliminados:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Agregar otro/a %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Eliminar?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Por %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelos en la aplicación %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "No tiene permiso para editar nada" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Acciones recientes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mis acciones" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ninguna disponible" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contenido desconocido" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -597,27 +626,27 @@ "tablas de la misma hayan sido creadas, y asegúrese de que el usuario " "apropiado tenga permisos de lectura en la base de datos." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Contraseña:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "¿Ha olvidado su contraseña o nombre de usuario?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Fecha/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usuario" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Acción" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -625,114 +654,61 @@ "Este objeto no tiene historia de modificaciones. Probablemente no fue " "añadido usando este sitio de administración." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostrar todos/as" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Guardar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Buscar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s results" msgstr[1] "%(counter)s resultados" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "total: %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Guardar como nuevo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Guardar y agregar otro" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Guardar y continuar editando" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primero introduzca un nombre de usuario y una contraseña. Luego podrá " -"configurar opciones adicionales acerca del usuario." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Introduzca un nombre de usuario y una contraseña." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Introduzca una nueva contraseña para el usuario %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Contraseña" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Contraseña (de nuevo)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Para verificar, introduzca la misma contraseña que introdujo arriba." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Eliminar" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Agregar otro/a %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Eliminar?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Gracias por el tiempo que ha dedicado al sitio web hoy." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Identificarse de nuevo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cambio de contraseña" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Cambio de contraseña exitoso" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Su contraseña ha sido cambiada." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -741,46 +717,34 @@ "antigua y luego introduzca la nueva contraseña dos veces para verificar que " "la ha escrito correctamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Contraseña anterior" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nueva contraseña" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Cambiar mi contraseña" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Recuperar contraseña" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Reinicialización de contraseña completada" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Se le ha enviado su contraseña. Ahora puede continuar e ingresar." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmación de reincialización de contraseña" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Introduzca la nueva contraseña" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -788,19 +752,15 @@ "Por favor introduzca su nueva contraseña dos veces de manera que podamos " "verificar que la ha escrito correctamente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nueva contraseña:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirme contraseña:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Reinicialización de contraseña no exitosa" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -809,12 +769,7 @@ "a que ya ha sido usado. Por favor solicite una nueva reinicialización de " "contraseña." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Recuperación de contraseña exitosa" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -822,7 +777,7 @@ "Le hemos enviado un correo electrónico con las instrucciones para configurar " "la contraseña. Usted debe recibirlo en cualquier momento." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -830,7 +785,7 @@ "Si usted no recibe un correo electrónico, por favor, asegúrese de que ha " "introducido la dirección con la que se registró, y revise su carpeta de spam." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -839,26 +794,26 @@ "Usted está recibiendo este correo electrónico porque ha solicitado un " "restablecimiento de contraseña para la cuenta de usuario en %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" "Por favor visite la página que se muestra a continuación y elija una nueva " "contraseña:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Su nombre de usuario, en caso de haberlo olvidado:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "¡Gracias por usar nuestro sitio!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "El equipo de %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -866,28 +821,52 @@ "¿Olvidó su contraseña? Ingrese su dirección de correo electrónico, y le " "enviaremos las instrucciones para establecer una nueva." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Correo electrónico:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Recuperar mi contraseña" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Todas las fechas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ninguno)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Seleccione %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Seleccione %s a modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Fecha:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Buscar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Agregar otro/a" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Actualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Modificar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es_VE/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,188 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2013-04-25 07:59+0000\n" +"Last-Translator: Django team\n" +"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/" +"django/language/es_VE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_VE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/es_VE/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,814 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Spanish (Venezuela) (http://www.transifex.com/projects/p/" +"django/language/es_VE/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: es_VE\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "" + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "" + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "" + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "" + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "" + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "" + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "" + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "" + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/et/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,14 @@ # Translators: # eallik , 2011 # Jannis Leidel , 2011 -# jannolii , 2013 +# Janno Liivak , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-05-28 15:19+0000\n" -"Last-Translator: jannolii \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-20 21:21+0000\n" +"Last-Translator: Janno Liivak \n" "Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Saadaval %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +34,38 @@ "kirjet allolevast kastist ning vajutades noolt \"Vali\" liigutada neid ühest " "kastist teise." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Filtreeri selle kasti abil välja \"%s\" nimekirja." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Vali kõik" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Kliki, et valida kõik %s korraga." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Vali" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Eemalda" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Valitud %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,22 +75,24 @@ "allolevast kastist ning vajutades noolt \"Eemalda\" liigutada neid ühest " "kastist teise." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Eemalda kõik" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Kliki, et eemaldada kõik valitud %s korraga." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s %(cnt)sst valitud" msgstr[1] "%(sel)s %(cnt)sst valitud" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +100,8 @@ "Muudetavates lahtrites on salvestamata muudatusi. Kui sooritate mõne " "toimingu, lähevad salvestamata muudatused kaotsi." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -107,7 +110,8 @@ "Valisid toimingu, kuid pole salvestanud muudatusi lahtrites. Salvestamiseks " "palun vajuta OK. Pead toimingu uuesti käivitama." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,70 +120,86 @@ "Valisid toimingu, kuid sa pole ühtegi lahtrit muutnud. Tõenäoliselt peaksid " "vajutama 'Mine' mitte 'Salvesta' nuppu." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Jaanuar Veebruar Märts Aprill Mai Juuni Juuli August September Oktoober " -"November Detsember" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "P E T K N R L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Näita" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Varja" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Märkus: Olete %s tund serveri ajast ees." +msgstr[1] "Märkus: Olete %s tundi serveri ajast ees." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Märkus: Olete %s tund serveri ajast maas." +msgstr[1] "Märkus: Olete %s tundi serveri ajast maas." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Praegu" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Kell" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Vali aeg" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Kesköö" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 hommikul" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Keskpäev" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Tühista" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Täna" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Eile" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Homme" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Jaanuar Veebruar Märts Aprill Mai Juuni Juuli August September Oktoober " +"November Detsember" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "P E T K N R L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Näita" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Varja" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/et/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/et/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/et/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/et/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/et/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/et/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,14 @@ # Translators: # eallik , 2011 # Jannis Leidel , 2011 -# jannolii , 2013 +# Janno Liivak , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 11:45+0000\n" -"Last-Translator: jannolii \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-20 21:03+0000\n" +"Last-Translator: Janno Liivak \n" "Language-Team: Estonian (http://www.transifex.com/projects/p/django/language/" "et/)\n" "MIME-Version: 1.0\n" @@ -19,62 +19,68 @@ "Language: et\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s kustutamine õnnestus." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ei saa kustutada %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Kas olete kindel?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Kustuta valitud %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administreerimine" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Kõik" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Jah" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ei" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Tundmatu" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Suvaline kuupäev" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Täna" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Viimased 7 päeva" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Käesolev kuu" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Käesolev aasta" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,100 +89,97 @@ "Palun sisestage personali kontole õige %(username)s ja parool. Teadke, et " "mõlemad väljad võivad olla tõstutundlikud." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Teie sessioon on aegunud. Palun logige uuesti sisse." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Toiming:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "toimingu aeg" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekti id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekti esitus" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "toimingu lipp" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "muudatuse tekst" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "logisissekanne" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "logisissekanded" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Lisatud \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Muudetud \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Kustutatud \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objekt LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Puudub" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Muutsin %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ja" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lisatud %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Muudetud %(list)s objektil %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Kustutatud %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ühtegi välja ei muudetud." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" lisamine õnnestus. Te võite seda muuta." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -184,12 +187,12 @@ msgstr "" "%(name)s \"%(obj)s\" lisamine õnnestus. Allpool saate lisada uue %(name)s." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" lisamine õnnestus." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -197,7 +200,7 @@ msgstr "" "%(name)s \"%(obj)s\" muutmine õnnestus. Allpool saate seda uuesti muuta." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -205,12 +208,12 @@ msgstr "" "%(name)s \"%(obj)s\" muutmine õnnestus. Allpool saate lisada uue %(name)s." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" muutmine õnnestus." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -218,66 +221,66 @@ "Palun märgistage elemendid, millega soovite toiminguid sooritada. Ühtegi " "elementi ei muudetud." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Toiming valimata." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Lisa %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" kustutati." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objekt primaarvõtmega %(key)r ei eksisteeri." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Lisa %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Muuda %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Andmebaasi viga" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s muutmine õnnestus." msgstr[1] "%(count)s %(name)s muutmine õnnestus." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valitud" msgstr[1] "Kõik %(total_count)s valitud" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "valitud 0/%(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" kustutati." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Muudatuste ajalugu: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -286,83 +289,71 @@ "Et kustutada %(class_name)s %(instance)s, on vaja kustutada järgmised " "kaitstud seotud objektid: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Sisene" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administreerimisliides" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administreerimisliides" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Saidi administreerimine" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s - administreerimine" - -#: widgets.py:90 -msgid "Date:" -msgstr "Kuupäev:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Aeg:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Otsi" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Lisa Uus" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Hetkel:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Sisene" -#: widgets.py:303 -msgid "Change:" -msgstr "Muuda:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s administreerimine" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Lehte ei leitud" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Vabandame, kuid soovitud lehte ei leitud." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Kodu" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serveri viga" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serveri viga (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serveri Viga (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -370,120 +361,142 @@ "Ilmnes viga. Sellest on e-posti teel teavitatud lehe administraatorit ja " "viga parandatakse esimesel võimalusel. Täname kannatlikkuse eest." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Käivita valitud toiming" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Mine" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kliki siin, et märgistada objektid üle kõigi lehekülgede" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Märgista kõik %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Tühjenda valik" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Kõige pealt sisestage kasutajatunnus ja salasõna, seejärel on võimalik muuta " +"täiendavaid kasutajaandmeid." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Sisestage kasutajanimi ja salasõna." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Muuda salasõna" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Palun parandage allolevad vead" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Palun parandage allolevad vead." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Sisestage uus salasõna kasutajale %(username)s" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Salasõna" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Salasõna (uuesti)" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" +"Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Tere tulemast," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentatsioon" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Muuda salasõna" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Logi välja" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administreerimisliides" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administreerimisliides" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Lisa" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Ajalugu" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Näita lehel" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Palun parandage allolevad vead" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Palun parandage allolevad vead." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Lisa %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtreeri" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Eemalda sorteerimisest" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorteerimisjärk: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Sorteerimine" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Kustuta" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -494,7 +507,7 @@ "kustutada lisaks ka kõik seotud objecktid, aga teil puudub õigus järgnevat " "tüüpi objektide kustutamiseks:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -503,7 +516,7 @@ "Et kustutada %(object_name)s '%(escaped_object)s', on vaja kustutada " "järgmised kaitstud seotud objektid:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -513,16 +526,16 @@ "\"%(escaped_object)s\"? Kõik järgnevad seotud objektid kustutatakse koos " "sellega:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Jah, olen kindel" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Kustuta mitu objekti" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -532,7 +545,7 @@ "Kui kustutada valitud %(objects_name)s, peaks kustutama ka seotud objektid, " "aga sinu kasutajakontol pole õigusi järgmiste objektitüüpide kustutamiseks:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -541,7 +554,7 @@ "Et kustutada valitud %(objects_name)s, on vaja kustutada ka järgmised " "kaitstud seotud objektid:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -550,41 +563,56 @@ "Kas oled kindel, et soovid kustutada valitud %(objects_name)s? Kõik " "järgnevad objektid ja seotud objektid kustutatakse:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Eemalda" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Lisa veel üks %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Kustutan?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Rakenduse %(name)s moodulid" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Muuda" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Teil ei ole õigust midagi muuta." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Hiljutised Toimingud" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Minu Toimingud" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ei leitud ühtegi" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Tundmatu sisu" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -594,27 +622,27 @@ "andmebaasitabelid on loodud ning et andmebaas on vastava kasutaja poolt " "loetav." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Salasõna:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Unustasite oma parooli või kasutajanime?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Kuupäev/kellaaeg" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Kasutaja" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Toiming" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -622,113 +650,61 @@ "Sellel objektil puudub muudatuste ajalugu. Tõenäoliselt ei kasutatud selle " "objekti lisamisel käesolevat administreerimislidest." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Näita kõiki" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Salvesta" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Otsing" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s tulemus" msgstr[1] "%(counter)s tulemust" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "Kokku %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Salvesta uuena" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Salvesta ja lisa uus" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Salvesta ja jätka muutmist" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Kõige pealt sisestage kasutajatunnus ja salasõna, seejärel on võimalik muuta " -"täiendavaid kasutajaandmeid." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Sisestage kasutajanimi ja salasõna." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Sisestage uus salasõna kasutajale %(username)s" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Salasõna" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Salasõna (uuesti)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" -"Sisestage sama salasõna uuesti veendumaks, et sisestamisel ei tekkinud vigu" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Eemalda" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Lisa veel üks %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Kustutan?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Tänan, et veetsite aega meie lehel." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Logi uuesti sisse" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Salasõna muutmine" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Salasõna muutmine õnnestus" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Teie salasõna on vahetatud." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -737,46 +713,34 @@ "uus salasõna.Veendumaks, et uue salasõna sisestamisel ei tekkinud vigu, " "palun sisestage see kaks korda." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Vana salasõna" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Uus salasõna" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Muuda salasõna" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Uue parooli loomine" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Uue salasõna loomine valmis" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Teie salasõna on määratud. Võite nüüd sisse logida." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Uue salasõna loomise kinnitamine" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Sisestage uus salasõna" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -784,19 +748,15 @@ "Palun sisestage uus salasõna kaks korda, et saaksime veenduda, et " "sisestamisel ei tekkinud vigu." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Uus salasõna:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Kinnita salasõna:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Uue salasõna loomine ebaõnnestus" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -804,12 +764,7 @@ "Uue salasõna loomise link ei olnud korrektne. Võimalik, et seda on varem " "kasutatud. Esitage uue salasõna taotlus uuesti." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Uue parooli loomine õnnestus" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -817,7 +772,7 @@ "Saatsime teie poolt määratud e-postile parooli muutmise juhendi. Peaksite " "selle lähiajal kätte saama." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -825,7 +780,7 @@ "Kui te ei saa kirja siis kontrollige, et sisestasite e-posti aadressi " "millega registreerisite ning kontrollige oma rämpsposti kausta." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -834,24 +789,24 @@ "Saite käesoleva kirja kuna soovisite muuta lehel %(site_name)s oma " "kasutajakontoga seotud parooli." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Palun minge järmisele lehele ning sisestage uus salasõna" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Teie kasutajatunnus juhul, kui olete unustanud:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Täname meie lehte külastamast!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s meeskond" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -859,28 +814,52 @@ "Unustasite oma parooli? Sisestage allpool oma e-posti aadress ja me saadame " "teile juhendi, kuidas parooli muuta." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-posti aadress:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Reseti parool" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Kõik kuupäevad" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Puudub)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Vali %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Vali %s mida muuta" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Kuupäev:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Aeg:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Otsi" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Lisa Uus" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Hetkel:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Muuda:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/eu/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -6,11 +6,11 @@ # julen , 2012-2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" @@ -19,12 +19,12 @@ "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s Erabilgarri" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +34,38 @@ "azpiko \n" "kaxan hautatu eta kutxen artean dagoen \"Aukeratu\" gezian klik eginez." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Idatzi kutxa honetan erabilgarri dauden %s objektuak iragazteko." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtroa" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Denak aukeratu" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Egin klik %s guztiak batera aukeratzeko." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Aukeratu" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Kendu" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s Aukeratuak" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,22 +74,24 @@ "Hau da aukeratutako %s zerrenda. Hauetako zenbait ezaba ditzakezu azpiko " "kutxan hautatu eta bi kutxen artean dagoen \"Ezabatu\" gezian klik eginez." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Kendu guztiak" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Egin klik aukeratutako %s guztiak kentzeko." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s-etik %(sel)s aukeratuta" msgstr[1] "%(cnt)s-etik %(sel)s aukeratuta" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -97,7 +99,8 @@ "Gorde gabeko aldaketak dauzkazu eremuetan. Ekintza bat exekutatzen baduzu, " "gorde gabeko aldaketak galduko dira." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +109,8 @@ "Ekintza bat hautatu duzu, baina oraindik ez duzu eremuetako aldaketak gorde. " "Mesedez, sakatu OK gordetzeko. Ekintza berriro exekutatu beharko duzu." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -115,70 +119,86 @@ "Ekintza bat hautatu duzu, baina ez duzu inongo aldaketarik egin eremuetan. " "Litekeena da, Gorde botoia beharrean Aurrera botoiaren bila aritzea." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Urtarrila Otsaila Martxoa Apirila Maiatza Ekaina Uztaila Abuztua Iraila " -"Urria Azaroa Abendua" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "I A A A O O L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Erakutsi" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Izkutatu" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Orain" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Erlojua" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Aukeratu ordu bat" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Gauerdia" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Eguerdia" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Atzera" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Gaur" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Egutegia" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Atzo" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Bihar" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Urtarrila Otsaila Martxoa Apirila Maiatza Ekaina Uztaila Abuztua Iraila " +"Urria Azaroa Abendua" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "I A A A O O L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Erakutsi" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Izkutatu" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/eu/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/eu/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/eu/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/eu/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/eu/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,11 +7,11 @@ # julen , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 12:05+0000\n" -"Last-Translator: Aitzol Naberan \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+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" @@ -20,62 +20,68 @@ "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s elementu ezabatu dira." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ezin da %(name)s ezabatu" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ziur zaude?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Ezabatu aukeratutako %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Dena" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Bai" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ez" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Ezezaguna" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Edozein data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Gaur" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Aurreko 7 egunak" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Hilabete hau" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Urte hau" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,100 +90,97 @@ "Idatzi kudeaketa gunerako %(username)s eta pasahitz zuzena. Kontuan izan " "biek maiuskula/minuskulak desberdintzen dituztela." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Hasi saioa berriro, zure sesioa iraungitu egin da." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ekintza:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "Ekintza hordua" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "Objetuaren id-a" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "Objeturaren aurkezpena" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "Ekintza botoia" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "Mezua aldatu" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "Log sarrera" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "log sarrerak" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" gehituta." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" aldatuta - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" ezabatuta." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry objektua" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Bat ere ez" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s aldatuta." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "eta" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" gehituta." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Changed %(list)s for %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ezabatuta." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ez da eremurik aldatu." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ondo gehitu da. Jarraian aldatu dezakezu berriro." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -186,12 +189,12 @@ "%(name)s \"%(obj)s\" ondo gehitu da. Beste %(name)s bat gehitu dezakezu " "jarraian." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ondo gehitu da." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -200,7 +203,7 @@ "%(name)s \"%(obj)s\" ondo aldatu da. Aldaketa gehiago egin ditzazkezu " "jarraian." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -209,12 +212,12 @@ "%(name)s \"%(obj)s\" ondo aldatu da. Beste %(name)s bat gehitu dezakezu " "jarraian." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ondo aldatu da." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -222,66 +225,66 @@ "Elementuak aukeratu behar dira beraien gain ekintzak burutzeko. Ez da " "elementurik aldatu." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ez dago ekintzarik aukeratuta." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Gehitu %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" ondo ezabatu da." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Ez dago %(key)r gakodun %(name)s objekturik." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Gehitu %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Aldatu %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Datu-basearen errorea" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s %(count)s ondo aldatu da." msgstr[1] "%(count)s %(name)s ondo aldatu dira." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Guztira %(total_count)s aukeratuta" msgstr[1] "Guztira %(total_count)s aukeratuta" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Guztira %(cnt)s, 0 aukeratuta" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" ondo ezabatu da." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Aldaketen historia: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -291,83 +294,71 @@ "objektu hauek ezabatzea eragingo du:\n" "%(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Sartu" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django kudeaketa gunea" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django kudeaketa" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Webgunearen kudeaketa" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s kudeaketa" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Ordua:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Lookup" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Beste bat gehitu" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Oraingoa:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Sartu" -#: widgets.py:303 -msgid "Change:" -msgstr "Aldatu:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Ez da orririk aurkitu" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Barkatu, eskatutako orria ezin daiteke aurkitu" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Hasiera" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Zerbitzariaren errorea" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Zerbitzariaren errorea (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Zerbitzariaren errorea (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -375,120 +366,142 @@ "Errore bat gertatu da. Errorea guneko kudeatzaileari jakinarazi zaio email " "bidez eta laister egon beharko luke konponduta. Barkatu eragozpenak." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Burutu hautatutako ekintza" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Joan" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Egin klik hemen orri guztietako objektuak aukeratzeko" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Hautatu %(total_count)s %(module_name)s guztiak" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Garbitu hautapena" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Lehenik idatzi erabiltzaile-izena eta pasahitza. Gero erabiltzaile-aukera " +"gehiago aldatu ahal izango dituzu." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Idatzi erabiltzaile-izen eta pasahitza." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Aldatu pasahitza" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Zuzendu azpiko erroreak." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Idatzi pasahitz berria %(username)s erabiltzailearentzat." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Pasahitza" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Pasahitza (berriro)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Idatzi goiko pasahitz bera, egiaztapenerako." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Ongi etorri," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentazioa" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Aldatu pasahitza" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Irten" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django kudeaketa gunea" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django kudeaketa" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Gehitu" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ikusi gunean" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Zuzendu azpiko erroreak." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Gehitu %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Iragazkia" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Kendu ordenaziotik" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Ordenatzeko lehentasuna: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Txandakatu ordenazioa" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Ezabatu" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -498,7 +511,7 @@ "%(object_name)s ezabatzean bere '%(escaped_object)s' ere ezabatzen dira, " "baina zure kontuak ez dauka baimenik objetu mota hauek ezabatzeko:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -507,7 +520,7 @@ "%(object_name)s '%(escaped_object)s' ezabatzeak erlazionatutako objektu " "babestu hauek ezabatzea eskatzen du:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -516,16 +529,16 @@ "Ziur zaude %(object_name)s \"%(escaped_object)s\" ezabatu nahi dituzula? " "Erlazionaturik dauden hurrengo elementuak ere ezabatuko dira:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Bai, ziur nago" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Ezabatu hainbat objektu" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -536,7 +549,7 @@ "eskatzen du baina zure kontuak ez dauka baimen nahikorik objektu mota hauek " "ezabatzeko: " -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -545,7 +558,7 @@ "Hautatutako %(objects_name)s ezabatzeak erlazionatutako objektu babestu " "hauek ezabatzea eskatzen du:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -554,41 +567,56 @@ "Ziur zaude hautatutako %(objects_name)s ezabatu nahi duzula? Objektu guzti " "hauek eta erlazionatutako elementu guztiak ezabatuko dira:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Kendu" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Gehitu beste %(verbose_name)s bat" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Ezabatu?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Irizpidea: %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s aplikazioaren modeloak" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Aldatu" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Ez daukazu ezer aldatzeko baimenik." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Azken ekintzak" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Nire ekintzak" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ez dago ezer" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Eduki ezezaguna" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -597,27 +625,27 @@ "Zerbait gaizki dago zure datu-basearekin. Ziurtatu datu-baseko taulak sortu " "direla eta erabiltzaile egokiak irakurtzeko baimena duela." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Pasahitza:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Pasahitza edo erabiltzaile-izena ahaztu duzu?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/ordua" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Erabiltzailea" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ekintza" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -625,113 +653,61 @@ "Objektu honek ez dauka aldaketen historiarik. Ziurrenik kudeaketa gunetik " "kanpo gehituko zen." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Erakutsi dena" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Gorde" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Bilatu" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "Emaitza %(counter)s " msgstr[1] "%(counter)s emaitza" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s guztira" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Gorde berri gisa" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Gorde eta gehitu beste bat" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Gorde eta jarraitu editatzen" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Lehenik idatzi erabiltzaile-izena eta pasahitza. Gero erabiltzaile-aukera " -"gehiago aldatu ahal izango dituzu." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Idatzi erabiltzaile-izen eta pasahitza." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Idatzi pasahitz berria %(username)s erabiltzailearentzat." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Pasahitza" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Pasahitza (berriro)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Idatzi goiko pasahitz bera, egiaztapenerako." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Kendu" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Gehitu beste %(verbose_name)s bat" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Ezabatu?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Eskerrik asko webguneari zure probetxuzko denbora eskaintzeagatik." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Hasi saioa berriro" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Aldatu pasahitza" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Pasahitza ondo aldatu da" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Zure pasahitza aldatu egin da." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -739,64 +715,48 @@ "Idatzi pasahitz zaharra segurtasun arrazoiengatik eta gero pasahitz berria " "bi aldiz, akatsik egiten ez duzula ziurta dezagun." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Pasahitz zaharra" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Pasahitz berria" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Aldatu nire pasahitza" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Berrezarri pasahitza" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Pasahitza berrezartzea burutu da" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Zure pasahitza ezarri da. Orain aurrera egin eta sartu zaitezke." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Pasahitza berrezartzeko berrespena" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Idatzi pasahitz berria" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Idatzi pasahitz berria birritan ondo idatzita dagoela ziurta dezagun." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Pasahitz berria:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Berretsi pasahitza:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Pasahitza ez da berrezarri" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -804,12 +764,7 @@ "Pasahitza berrezartzeko loturak baliogabea dirudi. Baliteke lotura aurretik " "erabilita egotea. Eskatu berriro pasahitza berrezartzea." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Pasahitza ondo berrezarri da" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -817,7 +772,7 @@ "Emandako helbide elektronikora bidali dizkizugu pasahitza berrezartzeko " "jarraibideak. Epe laburrean jaso behar zenuke." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -825,7 +780,7 @@ "Ez baduzu mezurik jasotzen, ziurtatu izena ematean erabilitako helbide " "berdina idatzi duzula eta egiaztatu spam karpeta." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -834,24 +789,24 @@ "Mezu hau %(site_name)s webgunean pasahitza berrezartzea eskatu duzulako jaso " "duzu" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Zoaz hurrengo orrira eta aukeratu pasahitz berria:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Zure erabiltzaile-izena (ahaztu baduzu):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Mila esker gure webgunea erabiltzeagatik!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s webguneko taldea" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -859,28 +814,52 @@ "Pasahitza ahaztu duzu? Idatzi zure helbide elektronikoa eta berri bat " "ezartzeko jarraibideak bidaliko dizkizugu." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Helbide elektronikoa:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Berrezarri pasahitza" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Data guztiak" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Bat ere ez)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Hautatu %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Hautatu %s aldatzeko" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Ordua:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Lookup" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Beste bat gehitu" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Oraingoa:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Aldatu:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fa/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,14 +4,15 @@ # Ali Nikneshan , 2011-2012 # Alireza Savand , 2012 # Jannis Leidel , 2011 +# Reza Mohammadi , 2014 # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-22 18:01+0000\n" +"Last-Translator: Reza Mohammadi \n" "Language-Team: Persian (http://www.transifex.com/projects/p/django/language/" "fa/)\n" "MIME-Version: 1.0\n" @@ -20,12 +21,12 @@ "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" -msgstr "%s موجود" +msgstr "%sی موجود" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +35,38 @@ "این لیست%s های در دسترس است. شما ممکن است برخی از آنها را در محل زیرانتخاب " "نمایید و سپس روی \"انتخاب\" بین دو جعبه کلیک کنید." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." -msgstr "درون این جعبه تایپ کنید تا لیست %s های موجود فیلتر شود." +msgstr "برای غربال فهرست %sی موجود درون این جعبه تایپ کنید." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" -msgstr "فیلتر" +msgstr "غربال" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "انتخاب همه" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." -msgstr "کلیک کنید را انتخاب کنید تمام %s را در یک بار." +msgstr "برای انتخاب یکجای همهٔ %s کلیک کنید." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "انتخاب" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "حذف" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s انتخاب شده" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,21 +75,23 @@ "این فهرست %s های انتخاب شده است. شما ممکن است برخی از انتخاب آنها را در محل " "زیر وارد نمایید و سپس روی \"حذف\" جهت دار بین دو جعبه حذف شده است." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "حذف همه" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." -msgstr "کلیک کنید تا تمام %s های انتخاب شده حذف شوند." +msgstr "برای حذف یکجای همهٔ %sی انتخاب شده کلیک کنید." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" -msgstr[0] " %(sel)s از %(cnt)s انتخاب شده است." +msgstr[0] " %(sel)s از %(cnt)s انتخاب شده‌اند" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +99,8 @@ "شما تغییراتی در بعضی فیلدهای قابل تغییر انجام داده اید. اگر کاری انجام " "دهید، تغییرات از دست خواهند رفت" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +110,8 @@ "اید. لطفا OK را فشار دهید تا ذخیره شود.\n" "شما باید عملیات را دوباره انجام دهید." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -115,68 +120,82 @@ "شما عملی را انجام داده اید، ولی تغییری انجام نداده اید. احتمالا دنبال کلید " "Go به جای Save میگردید." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "ژانویه فوریه مارس آوریل مه ژوئن ژوئیه اوت سپتامبر اکتبر نوامبر دسامبر" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "یکشنبه دوشنبه سه‌شنبه چهارشنبه پنجشنبه جمعه شنبه" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "نمایش" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "توجه: شما %s ساعت از زمان سرور جلو هستید." -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "پنهان کردن" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "توجه: شما %s ساعت از زمان سرور عقب هستید." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" -msgstr "حالا" +msgstr "اکنون" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "ساعت" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "یک زمان انتخاب کنید" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "نیمه‌شب" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "۶ صبح" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "ظهر" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "انصراف" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "امروز" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "تقویم" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "دیروز" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "فردا" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "ژانویه فوریه مارس آوریل مه ژوئن ژوئیه اوت سپتامبر اکتبر نوامبر دسامبر" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "یکشنبه دوشنبه سه‌شنبه چهارشنبه پنجشنبه جمعه شنبه" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "نمایش" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "پنهان کردن" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fa/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fa/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/fa/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/fa/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fa/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,13 +3,13 @@ # Translators: # Arash Fazeli , 2012 # Jannis Leidel , 2011 -# Reza Mohammadi , 2013 +# Reza Mohammadi , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-05 09:11+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-22 17:50+0000\n" "Last-Translator: Reza Mohammadi \n" "Language-Team: Persian (http://www.transifex.com/projects/p/django/language/" "fa/)\n" @@ -19,165 +19,168 @@ "Language: fa\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "%(count)d عدد از %(items)s با موفقیت پاک شد" +msgstr "%(count)d تا %(items)s با موفقیت حذف شدند." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "ناتوان در حذف %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "آیا مطمئن هستید؟" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "حذف %(verbose_name_plural)s های انتخاب شده" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "مدیریت" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "همه" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "بله" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "خیر" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "ناشناخته" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "هر تاریخی" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "امروز" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "۷ روز اخیر" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "این ماه" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "امسال" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"لطفا %(username)s و گذرواژهٔ را برای حساب کارکنان وارد کنید.\n" -"توجه داشته باشید که هر دو میتوانند به کوچکی و بزرگی حروف حساس باشند." +"لطفا %(username)s و گذرواژه را برای یک حساب کارمند وارد کنید.\n" +"توجه داشته باشید که ممکن است هر دو به کوچکی و بزرگی حروف حساس باشند." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "لطفا دوباره وارد شوید، جلسه شما منقضی شد." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" -msgstr "حرکت" +msgstr "اقدام:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" -msgstr "زمان اتفاق" +msgstr "زمان اقدام" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "شناسهٔ شیء" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "صورت شیء" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "نشانه عمل" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "پیغام تغییر" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "مورد اتفاقات" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "موارد اتفاقات" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" افروده شد." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "تغییر \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" حدف شد." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "شئ LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "هیچ" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s تغییر یافته." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "و" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s «%(object)s» اضافه شد." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s %(name)s «%(object)s» تغییر یافت." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s «%(object)s» حذف شد." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "فیلدی تغییر نیافته است." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s·\"%(obj)s\" با موفقیت اضافه شد. می‌توانید در این پایین ویرایشش کنید." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -186,12 +189,12 @@ "%(name)s \"%(obj)s\" با موفقیت اضافه شد. شما می‌توانید در ذیل یک %(name)s " "دیگر اضافه نمایید." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s «%(obj)s» با موفقیت اضافه شد." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -200,7 +203,7 @@ "%(name)s \"%(obj)s\" با موفقیت تغییر یافت. شما می‌توانید در ذیل مجدداُ آنرا " "ویرایش نمایید." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -209,12 +212,12 @@ "%(name)s \"%(obj)s\" با موفقیت تغییر یافت. شما می‌توانید در ذیل یک %(name)s " "دیگر اضافه نمایید." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s·\"%(obj)s\" با موفقیت تغییر یافت." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -222,64 +225,64 @@ "آیتم ها باید به منظور انجام عملیات بر روی آنها انتخاب شود. هیچ آیتمی با " "تغییر نیافته است." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "حرکتی انتخاب نشده" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "اضافه کردن %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s·\"%(obj)s\" با موفقیت حذف شد." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "ایتم%(name)s با کلید اصلی %(key)r وجود ندارد." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "اضافه کردن %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "تغییر %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "خطا در بانک اطلاعاتی" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s با موفقیت تغییر کرد." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "همه موارد %(total_count)s انتخاب شده" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 از %(cnt)s انتخاب شده‌اند" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s·\"%(obj)s\" با موفقیت حذف شد." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "تاریخچهٔ تغییر: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -288,83 +291,71 @@ "برای حذف %(class_name)s %(instance)s لازم است اشیای حفاظت شدهٔ زیر هم حذف " "شوند: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ورود" - -#: sites.py:386 -msgid "Site administration" -msgstr "مدیریت وبگاه" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "مدیریت %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "تاریخ:" - -#: widgets.py:91 -msgid "Time:" -msgstr "زمان:" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "مدیریت وب‌گاه Django" -#: widgets.py:165 -msgid "Lookup" -msgstr "جستجو" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "مدیریت Django" -#: widgets.py:260 -msgid "Add Another" -msgstr "اضافه کردن یکی دیگر" +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "مدیریت وب‌گاه" -#: widgets.py:302 -msgid "Currently:" -msgstr "در حال حاضر:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ورود" -#: widgets.py:303 -msgid "Change:" -msgstr "تغییر یافته:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "مدیریت ‎%(app)s‎" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "صفحه یافت نشد" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "متأسفیم، صفحه مورد تقاضا یافت نشد." +msgstr "شرمنده، صفحه مورد تقاضا یافت نشد." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "آغازه" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" -msgstr "خطای کارگزار" +msgstr "خطای سرور" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" -msgstr "خطای کارگزار (۵۰۰)" +msgstr "خطای سرور (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" -msgstr "خطای کارگزار (۵۰۰)" +msgstr "خطای سرور (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -372,120 +363,141 @@ "مشکلی پیش آمده. این مشکل از طریق ایمیل به مدیران سایت اطلاع داده شد و به " "زودی اصلاح میگردد. از صبر شما ممنونیم" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "اجرای حرکت انتخاب شده" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "برو" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "برای انتخاب موجودیت‌ها در تمام صفحات اینجا را کلیک کنید" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "انتخاب تمامی %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "لغو انتخاب‌ها" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"ابتدا یک نام کاربری و گذرواژه وارد کنید. سپس می توانید مشخصات دیگر کاربر را " +"ویرایش کنید." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "یک نام کاربری و رمز عبور را وارد کنید." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "تغییر گذرواژه" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "لطفاً خطای زیر را حل کنید." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "لطفاً خطاهای زیر را تصحیح کنید." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "برای کابر %(username)s یک گذرنامهٔ جدید وارد کنید." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "گذرواژه" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "گذرواژه (تکرار)" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "خوش آمدید،" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "مستندات" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "تغییر گذرواژه" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "خروج" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "وب‌گاه مدیریت Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "مدیریت Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "اضافه کردن" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "تاریخچه" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" -msgstr "مشاهده در وبگاه" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "لطفاً خطای زیر را حل کنید." +msgstr "مشاهده در وب‌گاه" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "لطفاً خطاهای زیر را تصحیح کنید." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "اضافه‌کردن %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "فیلتر" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "حذف از مرتب سازی" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "اولویت مرتب‌سازی: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "تعویض مرتب سازی" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "حذف" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -495,7 +507,7 @@ "حذف %(object_name)s·'%(escaped_object)s' می تواند باعث حذف اشیاء مرتبط شود. " "اما حساب شما دسترسی لازم برای حذف اشیای از انواع زیر را ندارد:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -504,7 +516,7 @@ "حذف %(object_name)s '%(escaped_object)s' نیاز به حذف موجودیت‌های مرتبط محافظت " "شده ذیل دارد:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -513,16 +525,16 @@ "آیا مطمئنید که می‌خواهید %(object_name)s·\"%(escaped_object)s\" را حذف کنید؟ " "کلیهٔ اشیای مرتبط زیر حذف خواهند شد:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "بله، مطمئن هستم." -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "حذف اشیاء متعدد" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -532,7 +544,7 @@ "حذف %(objects_name)s انتخاب شده منجر به حذف موجودیت‌های مرتبط خواهد شد، ولی " "شناسه شما اجازه حذف اینگونه از موجودیت‌های ذیل را ندارد:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -541,7 +553,7 @@ "حذف %(objects_name)s انتخاب شده نیاز به حذف موجودیت‌های مرتبط محافظت شده ذیل " "دارد:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -550,41 +562,56 @@ "آیا در خصوص حذف %(objects_name)s انتخاب شده اطمینان دارید؟ تمام موجودیت‌های " "ذیل به همراه موارد مرتبط با آنها حذف خواهند شد:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "حذف" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "افزودن یک %(verbose_name)s دیگر" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "حذف؟" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "براساس %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "مدلها در برنامه %(name)s " -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "تغییر" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "شما اجازهٔ ویرایش چیزی را ندارید." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "اعمال اخیر" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "اعمال من" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "چیزی در دسترس نیست" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "محتوا ناشناخته" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -594,139 +621,88 @@ "درستی ایجاد شده‌اند و اطمینان حاصل کنید که بانک اطلاعاتی توسط کاربر مربوطه " "قابل خواندن می باشد." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "گذرواژه:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" -msgstr "آیا گذرواژه یا نام کاربری خود را فراموش کرده؟" +msgstr "گذرواژه یا نام کاربری خود را فراموش کرده‌اید؟" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "تاریخ/ساعت" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "کاربر" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "عمل" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"این شیء تاریخچهٔ تغییرات ندارد. احتمالا این شیء توسط وبگاه مدیریت ایجاد نشده " +"این شیء تاریخچهٔ تغییرات ندارد. احتمالا این شیء توسط وب‌گاه مدیریت ایجاد نشده " "است." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "نمایش همه" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "ذخیره" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "جستجو" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s نتیجه" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" -msgstr "در مجموع %(full_result_count)s" +msgstr "در مجموع %(full_result_count)s تا" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "ذخیره به عنوان جدید" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "ذخیره و ایجاد یکی دیگر" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" -msgstr "ذخیره و ادامه ویرایش" - -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"ابتدا یک نام کاربری و گذرواژه وارد کنید. سپس می توانید مشخصات دیگر کاربر را " -"ویرایش کنید." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "یک نام کاربری و رمز عبور را وارد کنید." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "برای کابر %(username)s یک گذرنامهٔ جدید وارد کنید." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "گذرواژه" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "گذرواژه (تکرار)" +msgstr "ذخیره و ادامهٔ ویرایش" -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "همان گذرواژهٔ بالایی را برای اطمینان دوباره وارد کنید." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "حذف" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "افزودن یک %(verbose_name)s دیگر" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "حذف؟" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "متشکر از اینکه مدتی از وقت خود را به ما اختصاص دادید." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ورود دوباره" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "تغییر گذرواژه" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "گذرواژه تغییر یافت." - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "گذرواژهٔ شما تغییر یافت." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -734,46 +710,34 @@ "گذرواژهٔ قدیمی خود را، برای امنیت بیشتر، وارد کنید و سپس گذرواژهٔ جدیدتان را " "دوبار وارد کنید تا ما بتوانیم چک کنیم که به درستی تایپ کرده‌اید." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "گذرواژهٔ قدیمی" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "گذرواژهٔ جدید" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "تغییر گذرواژهٔ من" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "ایجاد گذرواژهٔ جدید" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "گذرواژهٔ جدید ایجاد شد" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." -msgstr "گذرواژهٔ جدیدتان تنظیم شد. اکنون می‌توانید وارد وبگاه شوید." +msgstr "گذرواژهٔ جدیدتان تنظیم شد. اکنون می‌توانید وارد وب‌گاه شوید." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" -msgstr "تصدیق گذرواژهٔ جدید" +msgstr "تأیید گذرواژهٔ جدید" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "ورود گذرواژهٔ جدید" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -781,19 +745,15 @@ "گذرواژهٔ جدیدتان را دوبار وارد کنید تا ما بتوانیم چک کنیم که به درستی تایپ " "کرده‌اید." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" -msgstr "گذرواژهٔ جدید" +msgstr "گذرواژهٔ جدید:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" -msgstr "تکرار گذرواژه" +msgstr "تکرار گذرواژه:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "گذرواژهٔ جدید ایجاد نشد." - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -801,19 +761,14 @@ "پیوند ایجاد گذرواژهٔ جدید نامعتبر بود، احتمالاً به این علت که قبلاً از آن " "استفاده شده است. لطفاً برای یک گذرواژهٔ جدید درخواست دهید." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "گذرواژهٔ جدید ایجاد شد." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" "دستورالعمل تنظیم گذرواژه را برایتان ایمیل کردیم. به زودی باید به دستتان برسد." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -821,7 +776,7 @@ "اگر ایمیلی دریافت نمی‌کنید، لطفاً بررسی کنید که آدرسی که وارد کرده‌اید همان است " "که با آن ثبت نام کرده‌اید، و پوشهٔ اسپم خود را نیز چک کنید." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -830,24 +785,24 @@ "شما این ایمیل را بخاطر تقاضای تغییر رمز حساب در %(site_name)s. دریافت کرده " "اید." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "لطفاً به صفحهٔ زیر بروید و یک گذرواژهٔ جدید انتخاب کنید:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" -msgstr "نام کاربریتان، اگر یادتان رفته است:" +msgstr "نام کاربری‌تان، چنانچه احیاناً یادتان رفته است:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" -msgstr "متشکر از استفادهٔ شما از وبگاه ما" +msgstr "ممنون از استفادهٔ شما از وب‌گاه ما" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "گروه %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -855,28 +810,52 @@ "رمز خود را فراموش کرده اید؟ آدرس ایمیل خود را در زیر وارد کنید، و ما روش " "تنظیم رمز جدید را برایتان می فرستیم." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "آدرس ایمیل:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "ایجاد گذرواژهٔ جدید" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "همهٔ تاریخ‌ها" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(هیچ)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s انتخاب کنید" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s را برای تغییر انتخاب کنید" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "تاریخ:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "زمان:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "جستجو" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "اضافه کردن یکی دیگر" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "در حال حاضر:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "تغییر یافته:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fi/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/" "fi/)\n" "MIME-Version: 1.0\n" @@ -18,72 +18,74 @@ "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Mahdolliset %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Suodatin" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Valitse kaikki" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Poista" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Valitut %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s valittuna %(cnt)s mahdollisesta" msgstr[1] "%(sel)s valittuna %(cnt)s mahdollisesta" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -91,7 +93,8 @@ "Sinulla on tallentamattomia muutoksia yksittäisissä muokattavissa kentissä. " "Jos suoritat toiminnon, tallentamattomat muutoksesi katoavat." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -101,7 +104,8 @@ "yksittäisiin kenttiin. Paina OK tallentaaksesi. Sinun pitää suorittaa " "toiminto uudelleen." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -110,70 +114,86 @@ "Olet valinnut toiminnon etkä ole tehnyt yhtään muutosta yksittäisissä " "kentissä. Etsit todennäköisesti Suorita-nappia Tallenna-napin sijaan." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Tammikuu Helmikuu Maaliskuu Huhtikuu Toukokuu Kesäkuu Heinäkuu Elokuu " -"Syyskuu Lokakuu Marraskuu Joulukuu" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T K T P L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Näytä" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Piilota" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nyt" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Kello" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Valitse kellonaika" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "24" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "06" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "12" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Peruuta" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Tänään" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalenteri" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Eilen" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Huomenna" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Tammikuu Helmikuu Maaliskuu Huhtikuu Toukokuu Kesäkuu Heinäkuu Elokuu " +"Syyskuu Lokakuu Marraskuu Joulukuu" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T K T P L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Näytä" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Piilota" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fi/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fi/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/fi/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/fi/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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 , 2012 +# Klaus Dahlén , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Finnish (http://www.transifex.com/projects/p/django/language/" "fi/)\n" @@ -19,193 +19,196 @@ "Language: fi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d \"%(items)s\"-kohdetta poistettu." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ei voida poistaa: %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Oletko varma?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Poista valitut \"%(verbose_name_plural)s\"-kohteet" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Kaikki" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Kyllä" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ei" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Tuntematon" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Mikä tahansa päivä" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Tänään" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Viimeiset 7 päivää" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Tässä kuussa" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Tänä vuonna" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Kirjaudu uudelleen sisään, sillä istuntosi on vanhentunut." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Toiminto:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "tapahtumahetki" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "kohteen tunniste" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "kohteen tiedot" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "tapahtumatyyppi" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "selitys" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "lokimerkintä" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "lokimerkinnät" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ei arvoa" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Muokattu: %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ja" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lisätty %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Muutettu %(list)s kohteelle %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Poistettu %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ei muutoksia kenttiin." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" on lisätty. Voit muokata sitä uudelleen alla." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" on lisätty." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" on muutettu." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -213,268 +216,277 @@ "Kohteiden täytyy olla valittuna, jotta niihin voi kohdistaa toimintoja. " "Kohteita ei ole muutettu." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ei toimintoa valittuna." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Lisää %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" on poistettu." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s perusavaimella %(key)r ei ole olemassa." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Lisää %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Muokkaa %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Tietokantavirhe" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s on muokattu." msgstr[1] "%(count)s \"%(name)s\"-kohdetta on muokattu." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valittu" msgstr[1] "Kaikki %(total_count)s valittu" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 valittuna %(cnt)s mahdollisesta" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" on poistettu." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Muokkaushistoria: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Kirjaudu sisään" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django-sivuston ylläpito" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Djangon ylläpito" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Sivuston ylläpito" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s ylläpito" - -#: widgets.py:90 -msgid "Date:" -msgstr "Pvm:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Klo:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Etsi" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Lisää seuraava" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Kirjaudu sisään" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Sivua ei löydy" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Pahoittelemme, pyydettyä sivua ei löytynyt." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Etusivu" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Palvelinvirhe" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Palvelinvirhe (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Palvelinvirhe (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Suorita valittu toiminto" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Suorita" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klikkaa tästä valitaksesi kohteet kaikilta sivuilta" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Valitse kaikki %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Tyhjennä valinta" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Syötä ensin käyttäjätunnus ja salasana. Sen jälkeen voit muokata muita " +"käyttäjän tietoja." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Syötä käyttäjätunnus ja salasana." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Vaihda salasana" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Korjaa allaolevat virheet." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Syötä käyttäjän %(username)s uusi salasana." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Salasana" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Salasana toistamiseen" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Tervetuloa," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Ohjeita" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Vaihda salasana" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Kirjaudu ulos" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django-sivuston ylläpito" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Djangon ylläpito" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Lisää" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Muokkaushistoria" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Näytä lopputulos" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Korjaa allaolevat virheet." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Lisää %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Suodatin" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Poista" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -485,7 +497,7 @@ "liittyviä kohteita, mutta sinulla ei ole oikeutta näiden kohteiden " "poistamiseen:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -494,7 +506,7 @@ "%(object_name)s '%(escaped_object)s': poistettaessa joudutaan poistamaan " "myös seuraavat suojatut siihen liittyvät kohteet:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -503,16 +515,16 @@ "Haluatko varmasti poistaa kohteen \"%(escaped_object)s\" (%(object_name)s)? " "Myös seuraavat kohteet poistettaisiin samalla:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Kyllä, olen varma" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Poista useita kohteita" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -523,7 +535,7 @@ "liittyviä kohteita. Sinulla ei kuitenkaan ole oikeutta poistaa seuraavia " "kohdetyyppejä:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -532,7 +544,7 @@ "Jos valitut %(objects_name)s poistetaan, pitää poistaa myös seuraavat " "suojatut niihin liittyvät kohteet:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -541,41 +553,56 @@ "Haluatki varmasti poistaa valitut %(objects_name)s? Samalla poistetaan " "kaikki alla mainitut ja niihin liittyvät kohteet:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Poista" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Lisää toinen %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Poista?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Muokkaa" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Sinulla ei ole oikeutta muokata mitään." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Viimeisimmät tapahtumat" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Omat tapahtumani" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ei yhtään" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Tuntematon sisältö" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -584,27 +611,27 @@ "Tietokanta-asennuksessa on jotain vialla. Varmista, että sopivat taulut on " "luotu ja että oikea käyttäjä voi lukea tietokantaa." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Salasana:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Unohditko salasanasi tai käyttäjätunnuksesi?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Pvm/klo" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Käyttäjä" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Tapahtuma" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -612,112 +639,61 @@ "Tällä kohteella ei ole muutoshistoriaa. Sitä ei ole ilmeisesti lisätty tämän " "ylläpitosivun avulla." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Näytä kaikki" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Tallenna ja poistu" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Haku" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s osuma" msgstr[1] "%(counter)s osumaa" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "yhteensä %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Tallenna uutena" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Tallenna ja lisää toinen" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Tallenna välillä ja jatka muokkaamista" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Syötä ensin käyttäjätunnus ja salasana. Sen jälkeen voit muokata muita " -"käyttäjän tietoja." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Syötä käyttäjätunnus ja salasana." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Syötä käyttäjän %(username)s uusi salasana." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Salasana" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Salasana toistamiseen" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Syötä sama salasana tarkistuksen vuoksi toistamiseen." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Poista" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Lisää toinen %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Poista?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Kiitos sivuillamme viettämästäsi ajasta." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Kirjaudu uudelleen sisään" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Salasanan vaihtaminen" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Salasanan vaihtaminen onnistui" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Salasanasi on vaihdettu." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -725,46 +701,34 @@ "Syötä vanha salasanasi varmistukseksi, ja syötä sitten uusi salasanasi kaksi " "kertaa, jotta se tulee varmasti oikein." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Vanha salasana" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Uusi salasana" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Vaihda salasana" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Salasanan nollaus" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Salasanan nollaus valmis" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Salasanasi on asetettu. Nyt voit kirjautua sisään." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Salasanan nollauksen vahvistus" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Syötä uusi salasana" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -772,19 +736,15 @@ "Syötä uusi salasanasi kaksi kertaa, jotta voimme varmistaa että syötit sen " "oikein." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Uusi salasana:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Varmista uusi salasana:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Salasanan nollaus ei onnistunut" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -792,75 +752,94 @@ "Salasanan nollauslinkki oli virheellinen, mahdollisesti siksi että se on jo " "käytetty. Ole hyvä ja pyydä uusi salasanan nollaus." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Salasanan nollaus onnistui" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Määrittele uusi salasanasi oheisella sivulla:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Käyttäjätunnuksesi siltä varalta, että olet unohtanut sen:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Kiitos vierailustasi sivuillamme!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s -sivuston ylläpitäjät" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Sähköpostiosoite:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Nollaa salasanani" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Kaikki päivät" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ei mitään)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Valitse %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Valitse muokattava %s" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Pvm:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Klo:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Etsi" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Lisää seuraava" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fr/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# claudep , 2011-2012 +# Claude Paroz , 2014 +# Claude Paroz , 2011-2012 # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 10:02+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/projects/p/django/language/" "fr/)\n" "MIME-Version: 1.0\n" @@ -18,12 +19,12 @@ "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s disponible(s)" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +34,38 @@ "sélectionnant dans la zone ci-dessous, puis en cliquant sur la flèche " "« Choisir » entre les deux zones." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Écrivez dans cette zone pour filtrer la liste des « %s » disponibles." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtrer" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Tout choisir" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Cliquez pour choisir tous les « %s » en une seule opération." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Choisir" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Enlever" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Choix des « %s »" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,22 +75,24 @@ "sélectionnant dans la zone ci-dessous, puis en cliquant sur la flèche « " "Enlever » entre les deux zones." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Tout enlever" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Cliquez pour enlever tous les « %s » en une seule opération." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s sur %(cnt)s sélectionné" msgstr[1] "%(sel)s sur %(cnt)s sélectionnés" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -97,7 +100,8 @@ "Vous avez des modifications non sauvegardées sur certains champs éditables. " "Si vous lancez une action, ces modifications vont être perdues." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -107,7 +111,8 @@ "certains champs modifiés. Cliquez sur OK pour sauver. Vous devrez " "réappliquer l'action." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +122,86 @@ "sur des champs. Vous cherchez probablement le bouton Envoyer et non le " "bouton Sauvegarder." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre " -"Décembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M J V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Afficher" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Masquer" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Note : l'heure du serveur précède votre heure de %s heure." +msgstr[1] "Note : l'heure du serveur précède votre heure de %s heures." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Note : votre heure précède l'heure du serveur de %s heure." +msgstr[1] "Note : votre heure précède l'heure du serveur de %s heures." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Maintenant" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Horloge" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Choisir une heure" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Minuit" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6:00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Midi" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Annuler" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Aujourd'hui" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendrier" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Hier" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Demain" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Janvier Février Mars Avril Mai Juin Juillet Août Septembre Octobre Novembre " +"Décembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M J V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Afficher" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Masquer" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fr/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/fr/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/fr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fr/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: -# claudep , 2013 -# claudep , 2011,2013 +# Claude Paroz , 2013-2014 +# Claude Paroz , 2011,2013 # 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-22 07:09+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:55+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: French (http://www.transifex.com/projects/p/django/language/" "fr/)\n" "MIME-Version: 1.0\n" @@ -19,62 +19,68 @@ "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "La suppression de %(count)d %(items)s a réussi." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Impossible de supprimer %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Êtes-vous sûr ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Supprimer les %(verbose_name_plural)s sélectionnés" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administration" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Tout" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Oui" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Non" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Inconnu" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Toutes les dates" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Aujourd'hui" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Les 7 derniers jours" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ce mois-ci" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Cette année" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,94 +90,91 @@ "passe » d'un compte autorisé. Sachez que les deux champs peuvent être " "sensibles à la casse." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Reconnectez-vous car votre session a expiré." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Action :" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "heure de l'action" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id de l'objet" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "représentation de l'objet" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "indicateur de l'action" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "message de modification" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrée d'historique" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entrées d'historique" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "%(object)s ajouté(e)s." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "%(object)s modifié(e)s - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "%(object)s supprimé(e)s" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objet de journal" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Aucun(e)" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modifié %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "et" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s « %(object)s » ajouté." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s modifié pour %(name)s « %(object)s »." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s « %(object)s » supprimé." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Aucun champ modifié." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -179,7 +182,7 @@ "L'objet %(name)s « %(obj)s » a été ajouté avec succès. Vous pouvez continuer " "l'édition ci-dessous." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,12 +191,12 @@ "L'objet %(name)s « %(obj)s » a été ajouté avec succès. Vous pouvez ajouter " "un autre objet « %(name)s » ci-dessous." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "L'objet %(name)s « %(obj)s » a été ajouté avec succès." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -202,7 +205,7 @@ "L'objet %(name)s « %(obj)s » a été modifié avec succès. Vous pouvez " "continuer l'édition ci-dessous." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -211,12 +214,12 @@ "L'objet %(name)s « %(obj)s » a été modifié avec succès. Vous pouvez ajouter " "un autre objet %(name)s ci-dessous." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "L'objet %(name)s « %(obj)s » a été modifié avec succès." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -224,66 +227,66 @@ "Des éléments doivent être sélectionnés afin d'appliquer les actions. Aucun " "élément n'a été modifié." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Aucune action sélectionnée." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Ajout %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "L'objet %(name)s « %(obj)s » a été supprimé avec succès." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "L'objet %(name)s avec la clef primaire %(key)r n'existe pas." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Ajout %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modification de %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Erreur de base de données" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s objet %(name)s a été modifié avec succès." msgstr[1] "%(count)s objets %(name)s ont été modifiés avec succès." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s sélectionné" msgstr[1] "Tous les %(total_count)s sélectionnés" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 sur %(cnt)s sélectionné" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "L'objet %(name)s « %(obj)s » a été supprimé avec succès." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historique des changements : %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -292,83 +295,71 @@ "Supprimer l'objet %(class_name)s « %(instance)s » provoquerait la " "suppression des objets liés et protégés suivants : %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Connexion" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Site d'administration de Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administration de Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administration du site" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administration %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Date :" - -#: widgets.py:91 -msgid "Time:" -msgstr "Heure :" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Recherche" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Ajouter un autre" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Actuellement :" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Connexion" -#: widgets.py:303 -msgid "Change:" -msgstr "Modifier :" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Administration de %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Cette page n'a pas été trouvée" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Nous sommes désolés, mais la page demandée est introuvable." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Accueil" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Erreur du serveur" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Erreur du serveur (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Erreur du serveur (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -377,120 +368,143 @@ "administrateurs du site et sera corrigée dans les meilleurs délais. Merci " "pour votre patience." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Exécuter l'action sélectionnée" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Envoyer" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Cliquez ici pour sélectionner tous les objets sur l'ensemble des pages" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Sélectionner tous les %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Effacer la sélection" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Saisissez tout d'abord un nom d'utilisateur et un mot de passe. Vous pourrez " +"ensuite modifier plus d'options." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Saisissez un nom d'utilisateur et un mot de passe." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Modifier le mot de passe" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Corrigez les erreurs suivantes." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Corrigez les erreurs ci-dessous." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Saisissez un nouveau mot de passe pour l'utilisateur %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Mot de passe" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Mot de passe (à nouveau)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Saisissez le même mot de passe que précédemment, pour vérification." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bienvenue," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentation" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Modifier votre mot de passe" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Déconnexion" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Site d'administration de Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administration de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Ajouter" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historique" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Voir sur le site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Corrigez les erreurs suivantes." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Corrigez les erreurs ci-dessous." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Ajouter %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtre" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Enlever du tri" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Priorité de tri : %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Inverser le tri" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Supprimer" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -501,7 +515,7 @@ "suppression des objets qui lui sont liés, mais votre compte ne possède pas " "la permission de supprimer les types d'objets suivants :" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -510,7 +524,7 @@ "Supprimer l'objet %(object_name)s « %(escaped_object)s » provoquerait la " "suppression des objets liés et protégés suivants :" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -520,16 +534,16 @@ "« %(escaped_object)s » ? Les éléments suivants sont liés à celui-ci et " "seront aussi supprimés :" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Oui, je suis sûr" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Supprimer plusieurs objets" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -540,7 +554,7 @@ "suppression d'objets liés, mais votre compte n'est pas autorisé à supprimer " "les types d'objet suivants :" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -549,7 +563,7 @@ "La suppression des objets %(objects_name)s sélectionnés provoquerait la " "suppression des objets liés et protégés suivants :" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -558,41 +572,56 @@ "Voulez-vous vraiment supprimer les objets %(objects_name)s sélectionnés ? " "Tous les objets suivants et les éléments liés seront supprimés :" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Supprimer" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Ajouter un objet %(verbose_name)s supplémentaire" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Supprimer ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Par %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modèles de l'application %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modifier" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Vous n'avez pas la permission de modifier quoi que ce soit." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Actions récentes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mes actions" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Aucun(e) disponible" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contenu inconnu" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -602,27 +631,27 @@ "tables utiles ont été créées, et que la base est accessible par " "l'utilisateur concerné." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Mot de passe :" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Mot de passe ou nom d'utilisateur oublié ?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Date/heure" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Utilisateur" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Action" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -630,114 +659,61 @@ "Cet objet n'a pas d'historique de modification. Il n'a probablement pas été " "ajouté au moyen de ce site d'administration." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Tout afficher" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Enregistrer" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Rechercher" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s résultat" msgstr[1] "%(counter)s résultats" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s résultats" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Enregistrer en tant que nouveau" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Enregistrer et ajouter un nouveau" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Enregistrer et continuer les modifications" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Saisissez tout d'abord un nom d'utilisateur et un mot de passe. Vous pourrez " -"ensuite modifier plus d'options." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Saisissez un nom d'utilisateur et un mot de passe." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Saisissez un nouveau mot de passe pour l'utilisateur %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Mot de passe" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Mot de passe (à nouveau)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Saisissez le même mot de passe que précédemment, pour vérification." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Supprimer" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Ajouter un objet %(verbose_name)s supplémentaire" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Supprimer ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Merci pour le temps que vous avez accordé à ce site aujourd'hui." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Connectez-vous à nouveau" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" -msgstr "Modification de votre mot de passe" +msgstr "Modification du mot de passe" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Mot de passe modifié avec succès" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Votre mot de passe a été modifié." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -746,47 +722,35 @@ "nouveau mot de passe à deux reprises afin de vérifier qu'il est correctement " "saisi." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Ancien mot de passe" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nouveau mot de passe" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Modifier mon mot de passe" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Réinitialisation du mot de passe" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Mise à jour du mot de passe effectuée avec succès" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Votre mot de passe a été défini. Vous pouvez maintenant vous authentifier." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmation de mise à jour du mot de passe" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Saisissez un nouveau mot de passe" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -794,19 +758,15 @@ "Saisissez deux fois votre nouveau mot de passe afin de vérifier qu'il est " "correctement saisi." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nouveau mot de passe :" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirmation du mot de passe :" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Échec lors de la mise à jour du mot de passe" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -815,12 +775,7 @@ "raison de sa précédente utilisation. Veuillez renouveler votre demande de " "mise à jour de mot de passe." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Mot de passe mis à jour avec succès" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -829,7 +784,7 @@ "passe à l'adresse que vous avez indiquée. Vous devriez le recevoir " "rapidement." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -838,7 +793,7 @@ "avec laquelle vous vous êtes enregistré et contrôlez votre dossier de " "pourriels." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -847,25 +802,25 @@ "Vous recevez ce message en réponse à votre demande de réinitialisation du " "mot de passe de votre compte sur %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" "Veuillez vous rendre sur cette page et choisir un nouveau mot de passe :" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Votre nom d'utilisateur, en cas d'oubli :" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Merci d'utiliser notre site !" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "L'équipe %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -873,28 +828,52 @@ "Mot de passe perdu ? Saisissez votre adresse électronique ci-dessous et nous " "vous enverrons les instructions pour en créer un nouveau." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Adresse électronique :" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Réinitialiser mon mot de passe" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Toutes les dates" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(aucun-e)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Sélectionnez %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Sélectionnez l'objet %s à changer" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Date :" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Heure :" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Recherche" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Ajouter un autre" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Actuellement :" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Modifier :" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fy/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,188 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 13:12+0000\n" +"Last-Translator: Claude Paroz \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" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fy/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fy/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fy/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/fy/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/fy/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fy/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,814 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 13:12+0000\n" +"Last-Translator: Claude Paroz \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" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "" + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "" + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "" + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "" + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "" + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "" + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "" + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "" + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po 2014-08-20 19:57:06.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fy_NL/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -# This file is distributed under the same license as the Django package. -# -msgid "" -msgstr "" -"Project-Id-Version: Django\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:35+0100\n" -"PO-Revision-Date: 2011-03-15 15:26+0000\n" -"Last-Translator: Django team\n" -"Language-Team: English \n" -"Language: fy_NL\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n != 1)\n" - -#: static/admin/js/SelectFilter2.js:45 -#, c-format -msgid "Available %s" -msgstr "" - -#: static/admin/js/SelectFilter2.js:46 -#, c-format -msgid "" -"This is the list of available %s. You may choose some by selecting them in " -"the box below and then clicking the \"Choose\" arrow between the two boxes." -msgstr "" - -#: static/admin/js/SelectFilter2.js:53 -#, c-format -msgid "Type into this box to filter down the list of available %s." -msgstr "" - -#: static/admin/js/SelectFilter2.js:57 -msgid "Filter" -msgstr "" - -#: static/admin/js/SelectFilter2.js:61 -msgid "Choose all" -msgstr "" - -#: static/admin/js/SelectFilter2.js:61 -#, c-format -msgid "Click to choose all %s at once." -msgstr "" - -#: static/admin/js/SelectFilter2.js:67 -msgid "Choose" -msgstr "" - -#: static/admin/js/SelectFilter2.js:69 -msgid "Remove" -msgstr "" - -#: static/admin/js/SelectFilter2.js:75 -#, c-format -msgid "Chosen %s" -msgstr "" - -#: static/admin/js/SelectFilter2.js:76 -#, c-format -msgid "" -"This is the list of chosen %s. You may remove some by selecting them in the " -"box below and then clicking the \"Remove\" arrow between the two boxes." -msgstr "" - -#: static/admin/js/SelectFilter2.js:80 -msgid "Remove all" -msgstr "" - -#: static/admin/js/SelectFilter2.js:80 -#, c-format -msgid "Click to remove all chosen %s at once." -msgstr "" - -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 -msgid "%(sel)s of %(cnt)s selected" -msgid_plural "%(sel)s of %(cnt)s selected" -msgstr[0] "" -msgstr[1] "" - -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 -msgid "" -"You have unsaved changes on individual editable fields. If you run an " -"action, your unsaved changes will be lost." -msgstr "" - -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6 -msgid "" -"You have selected an action, but you haven't saved your changes to " -"individual fields yet. Please click OK to save. You'll need to re-run the " -"action." -msgstr "" - -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 -msgid "" -"You have selected an action, and you haven't made any changes on individual " -"fields. You're probably looking for the Go button rather than the Save " -"button." -msgstr "" - -#: static/admin/js/calendar.js:26 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:27 -msgid "S M T W T F S" -msgstr "" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" - -#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:49 -#: static/admin/js/admin/DateTimeShortcuts.js:85 -msgid "Now" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:53 -msgid "Clock" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:81 -msgid "Choose a time" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:86 -msgid "Midnight" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:87 -msgid "6 a.m." -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:88 -msgid "Noon" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:92 -#: static/admin/js/admin/DateTimeShortcuts.js:204 -msgid "Cancel" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:144 -#: static/admin/js/admin/DateTimeShortcuts.js:197 -msgid "Today" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:148 -msgid "Calendar" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:195 -msgid "Yesterday" -msgstr "" - -#: static/admin/js/admin/DateTimeShortcuts.js:199 -msgid "Tomorrow" -msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/fy_NL/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 @@ -1,835 +0,0 @@ -# This file is distributed under the same license as the Django package. -# -# Translators: -msgid "" -msgstr "" -"Project-Id-Version: django-core\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-04-25 07:05+0000\n" -"Last-Translator: Django team\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" - -#: actions.py:49 -#, python-format -msgid "Successfully deleted %(count)d %(items)s." -msgstr "" - -#: actions.py:61 options.py:1418 -#, python-format -msgid "Cannot delete %(name)s" -msgstr "" - -#: actions.py:63 options.py:1420 -msgid "Are you sure?" -msgstr "" - -#: actions.py:84 -#, python-format -msgid "Delete selected %(verbose_name_plural)s" -msgstr "" - -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 -msgid "All" -msgstr "" - -#: filters.py:238 -msgid "Yes" -msgstr "" - -#: filters.py:239 -msgid "No" -msgstr "" - -#: filters.py:253 -msgid "Unknown" -msgstr "" - -#: filters.py:308 -msgid "Any date" -msgstr "" - -#: filters.py:309 -msgid "Today" -msgstr "" - -#: filters.py:313 -msgid "Past 7 days" -msgstr "" - -#: filters.py:317 -msgid "This month" -msgstr "" - -#: filters.py:321 -msgid "This year" -msgstr "" - -#: forms.py:9 -#, python-format -msgid "" -"Please enter the correct %(username)s and password for a staff account. Note " -"that both fields may be case-sensitive." -msgstr "" - -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 -msgid "Action:" -msgstr "" - -#: models.py:25 -msgid "action time" -msgstr "" - -#: models.py:28 -msgid "object id" -msgstr "" - -#: models.py:29 -msgid "object repr" -msgstr "" - -#: models.py:30 -msgid "action flag" -msgstr "" - -#: models.py:31 -msgid "change message" -msgstr "" - -#: models.py:36 -msgid "log entry" -msgstr "" - -#: models.py:37 -msgid "log entries" -msgstr "" - -#: models.py:46 -#, python-format -msgid "Added \"%(object)s\"." -msgstr "" - -#: models.py:48 -#, python-format -msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "" - -#: models.py:53 -#, python-format -msgid "Deleted \"%(object)s.\"" -msgstr "" - -#: models.py:55 -msgid "LogEntry Object" -msgstr "" - -#: options.py:173 options.py:202 -msgid "None" -msgstr "" - -#: options.py:763 -#, python-format -msgid "Changed %s." -msgstr "" - -#: options.py:763 options.py:773 options.py:1570 -msgid "and" -msgstr "" - -#: options.py:768 -#, python-format -msgid "Added %(name)s \"%(object)s\"." -msgstr "" - -#: options.py:772 -#, python-format -msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "" - -#: options.py:777 -#, python-format -msgid "Deleted %(name)s \"%(object)s\"." -msgstr "" - -#: options.py:781 -msgid "No fields changed." -msgstr "" - -#: options.py:884 options.py:927 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "" - -#: options.py:902 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was added successfully. You may add another " -"%(name)s below." -msgstr "" - -#: options.py:906 -#, python-format -msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "" - -#: options.py:920 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " -"below." -msgstr "" - -#: options.py:934 -#, python-format -msgid "" -"The %(name)s \"%(obj)s\" was changed successfully. You may add another " -"%(name)s below." -msgstr "" - -#: options.py:940 -#, python-format -msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "" - -#: options.py:1018 options.py:1278 -msgid "" -"Items must be selected in order to perform actions on them. No items have " -"been changed." -msgstr "" - -#: options.py:1037 -msgid "No action selected." -msgstr "" - -#: options.py:1117 -#, python-format -msgid "Add %s" -msgstr "" - -#: options.py:1141 options.py:1386 -#, python-format -msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "" - -#: options.py:1207 -#, python-format -msgid "Change %s" -msgstr "" - -#: options.py:1257 -msgid "Database error" -msgstr "" - -#: options.py:1320 -#, python-format -msgid "%(count)s %(name)s was changed successfully." -msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "" -msgstr[1] "" - -#: options.py:1347 -#, python-format -msgid "%(total_count)s selected" -msgid_plural "All %(total_count)s selected" -msgstr[0] "" -msgstr[1] "" - -#: options.py:1352 -#, python-format -msgid "0 of %(cnt)s selected" -msgstr "" - -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 -#, python-format -msgid "Change history: %s" -msgstr "" - -#. Translators: Model verbose name and instance representation, suitable to be -#. an item in a list -#: options.py:1564 -#, python-format -msgid "%(class_name)s %(instance)s" -msgstr "" - -#: options.py:1571 -#, python-format -msgid "" -"Deleting %(class_name)s %(instance)s would require deleting the following " -"protected related objects: %(related_objects)s" -msgstr "" - -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "" - -#: sites.py:386 -msgid "Site administration" -msgstr "" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "" - -#: widgets.py:91 -msgid "Time:" -msgstr "" - -#: widgets.py:165 -msgid "Lookup" -msgstr "" - -#: widgets.py:260 -msgid "Add Another" -msgstr "" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" - -#: widgets.py:303 -msgid "Change:" -msgstr "" - -#: templates/admin/404.html:4 templates/admin/404.html.py:8 -msgid "Page not found" -msgstr "" - -#: templates/admin/404.html:10 -msgid "We're sorry, but the requested page could not be found." -msgstr "" - -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 -msgid "Home" -msgstr "" - -#: templates/admin/500.html:7 -msgid "Server error" -msgstr "" - -#: templates/admin/500.html:11 -msgid "Server error (500)" -msgstr "" - -#: templates/admin/500.html:14 -msgid "Server Error (500)" -msgstr "" - -#: templates/admin/500.html:15 -msgid "" -"There's been an error. It's been reported to the site administrators via " -"email and should be fixed shortly. Thanks for your patience." -msgstr "" - -#: templates/admin/actions.html:4 -msgid "Run the selected action" -msgstr "" - -#: templates/admin/actions.html:4 -msgid "Go" -msgstr "" - -#: templates/admin/actions.html:11 -msgid "Click here to select the objects across all pages" -msgstr "" - -#: templates/admin/actions.html:11 -#, python-format -msgid "Select all %(total_count)s %(module_name)s" -msgstr "" - -#: templates/admin/actions.html:13 -msgid "Clear selection" -msgstr "" - -#: templates/admin/app_index.html:10 templates/admin/index.html:21 -#, python-format -msgid "%(name)s" -msgstr "" - -#: templates/admin/base.html:28 -msgid "Welcome," -msgstr "" - -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Documentation" -msgstr "" - -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Log out" -msgstr "" - -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 -msgid "Add" -msgstr "" - -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 -msgid "History" -msgstr "" - -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 -msgid "View on site" -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 -#, python-format -msgid "Add %(name)s" -msgstr "" - -#: templates/admin/change_list.html:78 -msgid "Filter" -msgstr "" - -#: templates/admin/change_list_results.html:17 -msgid "Remove from sorting" -msgstr "" - -#: templates/admin/change_list_results.html:18 -#, python-format -msgid "Sorting priority: %(priority_number)s" -msgstr "" - -#: templates/admin/change_list_results.html:19 -msgid "Toggle sorting" -msgstr "" - -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 -msgid "Delete" -msgstr "" - -#: templates/admin/delete_confirmation.html:18 -#, python-format -msgid "" -"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " -"related objects, but your account doesn't have permission to delete the " -"following types of objects:" -msgstr "" - -#: templates/admin/delete_confirmation.html:26 -#, python-format -msgid "" -"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " -"following protected related objects:" -msgstr "" - -#: templates/admin/delete_confirmation.html:34 -#, python-format -msgid "" -"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " -"All of the following related items will be deleted:" -msgstr "" - -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 -msgid "Yes, I'm sure" -msgstr "" - -#: templates/admin/delete_selected_confirmation.html:10 -msgid "Delete multiple objects" -msgstr "" - -#: templates/admin/delete_selected_confirmation.html:17 -#, python-format -msgid "" -"Deleting the selected %(objects_name)s would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" -msgstr "" - -#: templates/admin/delete_selected_confirmation.html:25 -#, python-format -msgid "" -"Deleting the selected %(objects_name)s would require deleting the following " -"protected related objects:" -msgstr "" - -#: templates/admin/delete_selected_confirmation.html:33 -#, python-format -msgid "" -"Are you sure you want to delete the selected %(objects_name)s? All of the " -"following objects and their related items will be deleted:" -msgstr "" - -#: templates/admin/filter.html:2 -#, python-format -msgid " By %(filter_title)s " -msgstr "" - -#: templates/admin/index.html:20 -#, python-format -msgid "Models in the %(name)s application" -msgstr "" - -#: templates/admin/index.html:39 -msgid "Change" -msgstr "" - -#: templates/admin/index.html:49 -msgid "You don't have permission to edit anything." -msgstr "" - -#: templates/admin/index.html:57 -msgid "Recent Actions" -msgstr "" - -#: templates/admin/index.html:58 -msgid "My Actions" -msgstr "" - -#: templates/admin/index.html:62 -msgid "None available" -msgstr "" - -#: templates/admin/index.html:76 -msgid "Unknown content" -msgstr "" - -#: templates/admin/invalid_setup.html:12 -msgid "" -"Something's wrong with your database installation. Make sure the appropriate " -"database tables have been created, and make sure the database is readable by " -"the appropriate user." -msgstr "" - -#: templates/admin/login.html:37 -msgid "Password:" -msgstr "" - -#: templates/admin/login.html:44 -msgid "Forgotten your password or username?" -msgstr "" - -#: templates/admin/object_history.html:23 -msgid "Date/time" -msgstr "" - -#: templates/admin/object_history.html:24 -msgid "User" -msgstr "" - -#: templates/admin/object_history.html:25 -msgid "Action" -msgstr "" - -#: templates/admin/object_history.html:39 -msgid "" -"This object doesn't have a change history. It probably wasn't added via this " -"admin site." -msgstr "" - -#: templates/admin/pagination.html:10 -msgid "Show all" -msgstr "" - -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 -msgid "Save" -msgstr "" - -#: templates/admin/search_form.html:7 -msgid "Search" -msgstr "" - -#: templates/admin/search_form.html:9 -#, python-format -msgid "%(counter)s result" -msgid_plural "%(counter)s results" -msgstr[0] "" -msgstr[1] "" - -#: templates/admin/search_form.html:9 -#, python-format -msgid "%(full_result_count)s total" -msgstr "" - -#: templates/admin/submit_line.html:5 -msgid "Save as new" -msgstr "" - -#: templates/admin/submit_line.html:6 -msgid "Save and add another" -msgstr "" - -#: templates/admin/submit_line.html:7 -msgid "Save and continue editing" -msgstr "" - -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 -msgid "Thanks for spending some quality time with the Web site today." -msgstr "" - -#: templates/registration/logged_out.html:10 -msgid "Log in again" -msgstr "" - -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 -msgid "Password change" -msgstr "" - -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "" - -#: templates/registration/password_change_done.html:17 -msgid "Your password was changed." -msgstr "" - -#: templates/registration/password_change_form.html:26 -msgid "" -"Please enter your old password, for security's sake, and then enter your new " -"password twice so we can verify you typed it in correctly." -msgstr "" - -#: templates/registration/password_change_form.html:32 -msgid "Old password" -msgstr "" - -#: templates/registration/password_change_form.html:37 -msgid "New password" -msgstr "" - -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 -msgid "Change my password" -msgstr "" - -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 -msgid "Password reset" -msgstr "" - -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 -msgid "Your password has been set. You may go ahead and log in now." -msgstr "" - -#: templates/registration/password_reset_confirm.html:7 -msgid "Password reset confirmation" -msgstr "" - -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 -msgid "" -"Please enter your new password twice so we can verify you typed it in " -"correctly." -msgstr "" - -#: templates/registration/password_reset_confirm.html:23 -msgid "New password:" -msgstr "" - -#: templates/registration/password_reset_confirm.html:25 -msgid "Confirm password:" -msgstr "" - -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 -msgid "" -"The password reset link was invalid, possibly because it has already been " -"used. Please request a new password reset." -msgstr "" - -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "" - -#: templates/registration/password_reset_done.html:17 -msgid "" -"We've emailed you instructions for setting your password. You should be " -"receiving them shortly." -msgstr "" - -#: templates/registration/password_reset_done.html:19 -msgid "" -"If you don't receive an email, please make sure you've entered the address " -"you registered with, and check your spam folder." -msgstr "" - -#: templates/registration/password_reset_email.html:2 -#, python-format -msgid "" -"You're receiving this email because you requested a password reset for your " -"user account at %(site_name)s." -msgstr "" - -#: templates/registration/password_reset_email.html:4 -msgid "Please go to the following page and choose a new password:" -msgstr "" - -#: templates/registration/password_reset_email.html:8 -msgid "Your username, in case you've forgotten:" -msgstr "" - -#: templates/registration/password_reset_email.html:10 -msgid "Thanks for using our site!" -msgstr "" - -#: templates/registration/password_reset_email.html:12 -#, python-format -msgid "The %(site_name)s team" -msgstr "" - -#: templates/registration/password_reset_form.html:17 -msgid "" -"Forgotten your password? Enter your email address below, and we'll email " -"instructions for setting a new one." -msgstr "" - -#: templates/registration/password_reset_form.html:21 -msgid "Email address:" -msgstr "" - -#: templates/registration/password_reset_form.html:21 -msgid "Reset my password" -msgstr "" - -#: templatetags/admin_list.py:348 -msgid "All dates" -msgstr "" - -#: views/main.py:35 -msgid "(None)" -msgstr "" - -#: views/main.py:84 -#, python-format -msgid "Select %s" -msgstr "" - -#: views/main.py:86 -#, python-format -msgid "Select %s to change" -msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ga/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # Michael Thornhill , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" @@ -19,12 +19,12 @@ "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s ar fáil" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,39 +34,39 @@ "sa bhosca thíos agus ansin cliceáil ar an saighead \"Roghnaigh\" idir an dá " "boscaí." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" "Scríobh isteach sa bhosca seo a scagadh síos ar an liosta de %s ar fáil." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Scagaire" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Roghnaigh iomlán" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Cliceáil anseo chun %s go léir a roghnú." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Roghnaigh" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Bain amach" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Roghnófar %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -76,16 +76,17 @@ "roghnaionn tú cuid acu sa bhosca thíos agus ansin cliceáil ar an saighead " "\"Bain\" idir an dá boscaí." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Scrois gach ceann" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Cliceáil anseo chun %s go léir roghnaithe a scroiseadh." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s roghnaithe" @@ -94,7 +95,8 @@ msgstr[3] "%(sel)s de %(cnt)s roghnaithe" msgstr[4] "%(sel)s de %(cnt)s roghnaithe" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -102,7 +104,8 @@ "Tá aithrithe nach bhfuil sabhailte ar chuid do na réimse. Má ritheann tú " "gníomh, caillfidh tú do chuid aithrithe." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -111,7 +114,8 @@ "Tá gníomh roghnaithe agat, ach níl do aithrithe sabhailte ar cuid de na " "réímse. Clic OK chun iad a sábháil. Caithfidh tú an gníomh a rith arís." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -120,70 +124,92 @@ "Tá gníomh roghnaithe agat, ach níl do aithrithe sabhailte ar cuid de na " "réímse. Is dócha go bhfuil tú ag iarraidh an cnaipe Té ná an cnaipe Sábháil." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Eanair Feabhra Márta Aibreán Bealtaine Meitheamh Iúil Lúnasa Mean Fómhair " -"Deireadh Fómhair Nollaig" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M C D A S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Taispeán" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Folaigh" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" +msgstr[4] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Anois" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Clog" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Roghnaigh am" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Meán oíche" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Nóin" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cealaigh" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Inniu" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Féilire" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Inné" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Amárach" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Eanair Feabhra Márta Aibreán Bealtaine Meitheamh Iúil Lúnasa Mean Fómhair " +"Deireadh Fómhair Nollaig" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M C D A S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Taispeán" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Folaigh" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ga/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ga/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ga/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ga/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ga/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,10 @@ # Michael Thornhill , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Irish (http://www.transifex.com/projects/p/django/language/" "ga/)\n" @@ -19,156 +19,159 @@ "Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : " "4);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "D'éirigh le scriosadh %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ní féidir scriosadh %(name)s " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "An bhfuil tú cinnte?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Scrios %(verbose_name_plural) roghnaithe" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Gach" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Tá" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Níl" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Gan aithne" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Aon dáta" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Inniu" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "7 lá a chuaigh thart" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Táim cinnte" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "An blian seo" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Le do thoil, logáil isteach arís cé go bhfuil to seisúin críochnaithe." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Aicsean:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "am aicsean" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id oibiacht" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr oibiacht" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "brat an aicsean" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "teachtaireacht athrú" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "loga iontráil" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "loga iontrálacha" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" curtha isteach." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" - %(changes)s aithrithe" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s.\" scrioste" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Oibiacht LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Dada" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Athraithe %s" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "agus" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Suimithe %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Athraithe %(list)s le %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Scriosaithe %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Dada réimse aithraithe" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,38 +179,38 @@ "Chuir an %(name)s·\"%(obj)s\"·go rathúil.·Is féidir leat é a cuir in eagar " "thíos." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Bhí %(name)s \"%(obj)s\" breisithe go rathúil" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Bhí an %(name)s \"%(obj)s\" aithraithe to rathúil" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -215,30 +218,35 @@ "Ní mór Míreanna a roghnú chun caingne a dhéanamh orthu. Níl aon mhíreanna a " "athrú." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Uimh gníomh roghnaithe." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Cuir %s le" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Bhí %(name)s \"%(obj)s\" scrioste go rathúil." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Níl réad le hainm %(name)s agus eochair %(key)r ann." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Cuir %s le" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Aithrigh %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Botún bunachar sonraí" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -248,7 +256,7 @@ msgstr[3] "%(count)s %(name)s athraithe go rathúil" msgstr[4] "%(count)s %(name)s athraithe go rathúil" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -258,232 +266,238 @@ msgstr[3] "Gach %(total_count)s roghnaithe" msgstr[4] "Gach %(total_count)s roghnaithe" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 as %(cnt)s roghnaithe." -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Bhí %(name)s \"%(obj)s\" scrioste go rathúil." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Athraigh stáir %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Logáil isteach" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Riarthóir suíomh Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Riarachán Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Riaracháin an suíomh" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s riaracháin" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dáta:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Am:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Cuardach" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Cuir le" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Logáil isteach" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Ní bhfuarthas an leathanach" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Tá brón orainn, ach ní bhfuarthas an leathanach iarraite." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Baile" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Botún freastalaí" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Botún freastalaí (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Botún Freastalaí (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Rith an gníomh roghnaithe" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Té" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" "Cliceáil anseo chun na hobiacht go léir a roghnú ar fud gach leathanach" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Roghnaigh gach %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Scroiseadh modhnóir" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Ar dtús, iontráil ainm úsaideoir agus focal faire. Ansin, beidh tú in ann " +"cuir in eagar níos mó roghaí úsaideoira." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Cuir isteach ainm úsáideora agus focal faire." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Athraigh focal faire" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Ceartaigh na botúin thíos le do thoil" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Iontráil focal faire nua le hadhaigh an úsaideor %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Focal faire" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Focal faire (arís)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Iontráíl an focal faire céanna mar thuas, le fíorúchán." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Fáilte" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Doiciméadúchán" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Athraigh focal faire" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Logáil amach" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Riarthóir suíomh Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Riarachán Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Cuir le" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Stair" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Breath ar suíomh" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Ceartaigh na botúin thíos le do thoil" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Cuir %(name)s le" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Scagaire" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Bain as sórtáil" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sórtáil tosaíocht: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Toggle sórtáil" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Cealaigh" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -493,7 +507,7 @@ "Má scriossan tú %(object_name)s '%(escaped_object)s' scriosfaidh oibiachtí " "gaolta. Ach níl cead ag do cuntas na oibiacht a leanúint a scriosadh:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -502,7 +516,7 @@ "Bheadh Scriosadh an %(object_name)s '%(escaped_object)s' a cheangal ar an " "méid seo a leanas a scriosadh nithe cosanta a bhaineann le:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -511,16 +525,16 @@ "An bhfuil tú cinnte na %(object_name)s \"%(escaped_object)s\" a scroiseadh?" "Beidh gach oibiacht a leanúint scroiste freisin:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Táim cinnte" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Scrios na réadanna" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -531,7 +545,7 @@ "gaolmhara a scriosadh, ach níl cead do chuntas a scriosadh na cineálacha seo " "a leanas na cuspóirí:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -540,7 +554,7 @@ "Teastaíonn scriosadh na %(objects_name)s roghnaithe scriosadh na hoibiacht " "gaolta cosainte a leanúint:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -549,41 +563,56 @@ "An bhfuil tú cinnte gur mian leat a scriosadh %(objects_name)s roghnaithe? " "Beidh gach ceann de na nithe seo a leanas agus a n-ítimí gaolta scroiste:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Tóg amach" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Cuir eile %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Cealaigh?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Trí %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Athraigh" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Níl cead agat aon rud a cuir in eagar." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Aicsean úrnua" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mo Aicseain" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Dada ar fáil" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Inneachair anaithnid" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -593,27 +622,27 @@ "boird an bunachar sonraI cruthaithe cheana, agus déan cinnte go bhfuil do " "úsaideoir in ann an bunacchar sonraí a léamh." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Focal faire:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Dearmad déanta ar do focal faire nó ainm úsaideora" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dáta/am" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Úsaideoir" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Aicsean" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -621,19 +650,20 @@ "Níl stáir aitraithe ag an oibiacht seo agús is dócha ná cuir le tríd an an " "suíomh riarachán." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Taispéan gach rud" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Sábháil" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Cuardach" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -643,95 +673,41 @@ msgstr[3] "%(counter)s torthaí" msgstr[4] "%(counter)s torthaí" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s iomlán" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Sabháil mar nua" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Sabháil agus cuir le ceann eile" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Sábhail agus lean ag cuir in eagar" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Ar dtús, iontráil ainm úsaideoir agus focal faire. Ansin, beidh tú in ann " -"cuir in eagar níos mó roghaí úsaideoira." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Cuir isteach ainm úsáideora agus focal faire." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Iontráil focal faire nua le hadhaigh an úsaideor %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Focal faire" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Focal faire (arís)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Iontráíl an focal faire céanna mar thuas, le fíorúchán." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Tóg amach" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Cuir eile %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Cealaigh?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Go raibh maith agat le hadhaigh do cuairt ar an suíomh idirlínn inniú." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Logáil isteacj arís" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Athrú focal faire" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Athrú an focal faire rathúil" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Bhí do focal faire aithraithe." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -740,46 +716,34 @@ "iontráil do focal faire dhá uaire cé go mbeimid in ann a seiceal go bhfuil " "sé scríobhte isteach i gceart." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Sean-focal faire " -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Focal faire nua" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Athraigh mo focal faire" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Athsocraigh focal faire" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Athshocraigh an focal faire críochnaithe" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Tá do focal faire réidh. Is féidir leat logáil isteach anois." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Deimhniú athshocraigh focal faire" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Cuir isteach focal faire nua" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -787,19 +751,15 @@ "Le do thoil, iontráil do focal faire dhá uaire cé go mbeimid in ann a " "seiceal go bhfuil sé scríobhte isteach i gceart." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Focal faire nua:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Deimhnigh focal faire:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Athshocraigh focal faire mí-rathúil" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,77 +767,96 @@ "Bhí nasc athshocraigh an focal faire mícheart, b'fheidir mar go raibh sé " "úsaidte cheana. Le do thoil, iarr ar athsocraigh focal faire nua." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Athshocraigh focal faire mí-rathúil" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" "Le do thoil té go dtí an leathanach a leanúint agus roghmaigh focal faire " "nua:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Do ainm úsaideoir, má tá dearmad déanta agat." -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Go raibh maith agat le hadhaigh do cuairt!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Foireann an %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Athsocraigh mo focal faire" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Gach dáta" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Dada)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Roghnaigh %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Roghnaigh %s a athrú" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dáta:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Am:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Cuardach" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Cuir le" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/gl/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,11 +7,11 @@ # Leandro Regueiro , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-09-07 11:49+0000\n" -"Last-Translator: Leandro Regueiro \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" @@ -20,12 +20,12 @@ "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s dispoñíbeis" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +35,38 @@ "caixa inferior e a continuación facendo clic na frecha \"Escoller\" situada " "entre as dúas caixas." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Escriba nesta caixa para filtrar a lista de %s dispoñíbeis." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Escoller todo" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Prema para escoller todos/as os/as '%s' dunha vez." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Escoller" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Retirar" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s escollido/a(s)" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -76,22 +76,24 @@ "caixa inferior e a continuación facendo clic na frecha \"Eliminar\" situada " "entre as dúas caixas." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Retirar todos" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Faga clic para eliminar da lista todos/as os/as '%s' escollidos/as." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s escollido" msgstr[1] "%(sel)s de %(cnt)s escollidos" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +101,8 @@ "Tes cambios sen guardar en campos editables individuales. Se executas unha " "acción, os cambios non gardados perderanse." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "Escolleu unha acción, pero aínda non gardou os cambios nos campos " "individuais. Prema OK para gardar. Despois terá que volver executar a acción." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -118,70 +122,86 @@ "individuais. Probabelmente estea buscando o botón Ir no canto do botón " "Gardar." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"xaneiro febreiro marzo abril maio xuño xullo agosto setembro outubro " -"novembro decembro" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M X V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Amosar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Esconder" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Agora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Reloxo" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Escolla unha hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Medianoite" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 da mañá" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mediodía" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancelar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hoxe" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendario" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Onte" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Mañá" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"xaneiro febreiro marzo abril maio xuño xullo agosto setembro outubro " +"novembro decembro" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M X V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Amosar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Esconder" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/gl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/gl/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/gl/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/gl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/gl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # Oscar Carballal , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-09-07 12:02+0000\n" -"Last-Translator: Leandro Regueiro \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+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" @@ -21,62 +21,68 @@ "Language: gl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Borrado exitosamente %(count)d %(items)s" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Non foi posíbel eliminar %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "¿Está seguro?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Borrar %(verbose_name_plural)s seleccionados." -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Todo" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Si" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Non" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Descoñecido" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Calquera data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hoxe" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últimos 7 días" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Este mes" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Este ano" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,100 +91,97 @@ "Por favor, insira os %(username)s e contrasinal dunha conta de persoal. Teña " "en conta que ambos os dous campos distingues maiúsculas e minúsculas." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Por favor ingrese de novo, a súa sesión expirou." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Acción:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora da acción" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id do obxecto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr do obxecto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "código do tipo de acción" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "cambiar mensaxe" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada de rexistro" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entradas de rexistro" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Engadido \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Modificados \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Borrados \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Obxecto LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ningún" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modificado(s) %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "e" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Engadido %(name)s \"%(object)s\"" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificáronse %(list)s en %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Elimináronse %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Non se modificou ningún campo." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\" Pode editalo embaixo." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +190,12 @@ "O/a %(name)s \"%(obj)s\" foi engadido correctamente. Pode engadir outro/a " "%(name)s embaixo." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Engadiuse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ "O/a %(name)s \"%(obj)s\" foi modificado correctamente. Pode editalo de novo " "embaixo." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "O/a %(name)s \"%(obj)s\" for modificalo correctamente. Pode engadir outro/a " "%(name)s embaixo." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Modificouse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,149 +226,137 @@ "Deb seleccionar ítems para poder facer accións con eles. Ningún ítem foi " "cambiado." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Non se elixiu ningunha acción." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Engadir %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "O obxecto %(name)s con primary key %(key)r non existe." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Engadir %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Erro da base de datos" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s foi cambiado satisfactoriamente." msgstr[1] "%(count)s %(name)s foron cambiados satisfactoriamente." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seleccionado." msgstr[1] "Tódolos %(total_count)s seleccionados." -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seleccionados." -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Eliminouse correctamente o/a %(name)s \"%(obj)s\"." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Histórico de cambios: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Iniciar sesión" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Administración de sitio Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administración de Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administración do sitio" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administración" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Procurar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Engadir outro" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Actualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Iniciar sesión" -#: widgets.py:303 -msgid "Change:" -msgstr "Modificar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Páxina non atopada" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Sentímolo, pero non se atopou a páxina solicitada." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Inicio" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Erro no servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Erro no servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Erro no servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -373,120 +364,142 @@ "Ocorreu un erro. Os administradores do sitio foron informados por email e " "debería ser arranxado pronto. Grazas pola súa paciencia." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Executar a acción seleccionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ir" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Fai clic aquí para seleccionar os obxectos en tódalas páxinas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seleccionar todos os %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Limpar selección" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primeiro insira un nome de usuario e un contrasinal. Despois poderá editar " +"máis opcións de usuario." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Introduza un nome de usuario e contrasinal." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cambiar contrasinal" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Corrixa os erros de embaixo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Insira un novo contrasinal para o usuario %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Contrasinal" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Contrasinal (outra vez)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Insira o mesmo contrasinal ca enriba para verificalo." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Benvido," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentación" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cambiar contrasinal" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Rematar sesión" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administración de sitio Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administración de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Engadir" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historial" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ver no sitio" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Corrixa os erros de embaixo." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Engadir %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtro" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Eliminar da clasificación" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioridade de clasificación: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Activar clasificación" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Eliminar" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -497,7 +510,7 @@ "elementos relacionados, pero a súa conta non ten permiso para borrar os " "seguintes tipos de elementos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -506,7 +519,7 @@ "Para borrar o obxecto %(object_name)s '%(escaped_object)s' requiriríase " "borrar os seguintes obxectos protexidos relacionados:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -515,16 +528,16 @@ "Seguro que quere borrar o %(object_name)s \"%(escaped_object)s\"? " "Eliminaranse os seguintes obxectos relacionados:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Si, estou seguro" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Eliminar múltiples obxectos" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -535,7 +548,7 @@ "de obxectos relacionados, pero a súa conta non ten permiso para borrar os " "seguintes tipos de obxecto:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -544,7 +557,7 @@ "Para borrar os obxectos %(objects_name)s relacionados requiriríase eliminar " "os seguintes obxectos protexidos relacionados:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -554,41 +567,56 @@ "Serán eliminados todos os seguintes obxectos e elementos relacionados on " "eles:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Retirar" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Engadir outro %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "¿Eliminar?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Por %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelos na aplicación %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Non ten permiso para editar nada." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Accións recentes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "As miñas accións" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ningunha dispoñíbel" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contido descoñecido" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +626,27 @@ "creasen as táboas axeitadas na base de datos, e de que o usuario apropiado " "teña permisos para lela." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Contrasinal:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "¿Olvidou o usuario ou contrasinal?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usuario" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Acción" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,113 +654,61 @@ "Este obxecto non ten histórico de cambios. Posibelmente non se creou usando " "este sitio de administración." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Amosar todo" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Gardar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Busca" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultado. " msgstr[1] "%(counter)s resultados." -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s en total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Gardar como novo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Gardar e engadir outro" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Gardar e seguir modificando" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primeiro insira un nome de usuario e un contrasinal. Despois poderá editar " -"máis opcións de usuario." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Introduza un nome de usuario e contrasinal." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Insira un novo contrasinal para o usuario %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Contrasinal" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Contrasinal (outra vez)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Insira o mesmo contrasinal ca enriba para verificalo." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Retirar" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Engadir outro %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "¿Eliminar?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Grazas polo tempo que dedicou ao sitio web." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Entrar de novo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cambiar o contrasinal" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "O seu contrasinal cambiouse correctamente." - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Cambiouse o seu contrasinal." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -740,48 +716,36 @@ "Por razóns de seguridade, introduza o contrasinal actual. Despois introduza " "dúas veces o contrasinal para verificarmos que o escribiu correctamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Contrasinal antigo" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Contrasinal novo" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Cambiar o contrasinal" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Recuperar o contrasinal" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Reseteo do contrasinal completo" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "A túa clave foi gardada.\n" "Xa podes entrar." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmación de reseteo da contrasinal" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Insira o novo contrasinal" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -789,19 +753,15 @@ "Por favor insira a súa contrasinal dúas veces para que podamos verificar se " "a escribiu correctamente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Contrasinal novo:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirmar contrasinal:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Reseteo da contrasinal non satisfactorio." - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -809,12 +769,7 @@ "A ligazón de reseteo da contrasinal non é válida, posiblemente porque xa foi " "usada. Por favor pida un novo reseteo da contrasinal." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "O contrasinal foi recuperado correctamente" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -822,13 +777,13 @@ "Acabamos de enviarlle as instrucións para configurar o contrasinal ao " "enderezo de email que nos indicou. Debería recibilas axiña." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -837,24 +792,24 @@ "Recibe este email porque solicitou restablecer o contrasinal para a súa " "conta de usuario en %(site_name)s" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Por favor vaia á seguinte páxina e elixa una nova contrasinal:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "No caso de que o esquecese, o seu nome de usuario é:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Grazas por usar o noso sitio web!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "O equipo de %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -862,28 +817,52 @@ "Esqueceu o contrasinal? Insira o seu enderezo de email embaixo e " "enviarémoslle as instrucións para configurar un novo." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Enderezo de correo electrónico:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Recuperar o meu contrasinal" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Todas as datas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ningún)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Seleccione un/unha %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Seleccione %s que modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Procurar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Engadir outro" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Actualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Modificar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/he/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,14 @@ # Translators: # Alex Gaynor , 2012 # Jannis Leidel , 2011 -# Meir Kriheli , 2011-2012 +# Meir Kriheli , 2011-2012,2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 08:24+0000\n" +"Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/" "he/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s זמינות" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "זו רשימת %s הזמינים לבחירה. ניתן לבחור חלק ע\"י סימון בתיבה מתחת ולחיצה על " "חץ \"בחר\" בין שתי התיבות." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "ניתן להקליד בתיבה זו כדי לסנן %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "סינון" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "בחירת הכל" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "בחירת כל ה%s בבת אחת." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "בחר" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "הסרה" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s אשר נבחרו" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "זו רשימת %s אשר נבחרו. ניתן להסיר חלק ע\"י בחירה בתיבה מתחת ולחיצה על חץ " "\"הסרה\" בין שתי התיבות." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "הסרת הכל" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "הסרת כל %s אשר נבחרו בבת אחת." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s מ %(cnt)s נבחרות" msgstr[1] "%(sel)s מ %(cnt)s נבחרות" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "יש לך שינויים שלא נשמרו על שדות יחידות. אם אתה מפעיל פעולה, שינויים שלא " "נשמרו יאבדו." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "בחרת פעולה, אבל עוד לא שמרת את השינויים לשדות בודדים. אנא לחץ על אישור כדי " "לשמור. יהיה עליך להפעיל את הפעולה עוד פעם." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,69 +118,85 @@ "בחרת פעולה, ולא עשיתה שינויימ על שדות. אתה כנראה מחפש את הכפתור ללכת במקום " "הכפתור לשמור." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"ינואר פברואר מרץ אפריל מאי יוני יולי אוגוסט ספטמבר אוקטובר נובמבר דצמבר" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "א ב ג ד ה ו ש" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "הצג" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "הסתר" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "הערה: את/ה %s שעה לפני זמן השרת." +msgstr[1] "הערה: את/ה %s שעות לפני זמן השרת." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "הערה: את/ה %s שעה אחרי זמן השרת." +msgstr[1] "הערה: את/ה %s שעות אחרי זמן השרת." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "כעת" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "שעון" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "בחירת שעה" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "חצות" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 בבוקר" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "12 בצהריים" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "ביטול" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "היום" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "לוח שנה" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "אתמול" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "מחר" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"ינואר פברואר מרץ אפריל מאי יוני יולי אוגוסט ספטמבר אוקטובר נובמבר דצמבר" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "א ב ג ד ה ו ש" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "הצג" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "הסתר" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/he/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/he/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/he/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/he/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/he/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/he/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,13 +3,13 @@ # Translators: # Alex Gaynor , 2011 # 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-02 11:45+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 08:21+0000\n" "Last-Translator: Meir Kriheli \n" "Language-Team: Hebrew (http://www.transifex.com/projects/p/django/language/" "he/)\n" @@ -19,62 +19,68 @@ "Language: he\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s נמחקו בהצלחה." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "לא ניתן למחוק %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "האם את/ה בטוח/ה ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "מחק %(verbose_name_plural)s שנבחרו" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "ניהול" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "הכל" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "כן" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "לא" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "לא ידוע" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "כל תאריך" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "היום" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "בשבוע האחרון" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "החודש" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "השנה" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,100 +89,97 @@ "נא להזין את %(username)s והסיסמה הנכונים לחשבון איש צוות. נא לשים לב כי שני " "השדות רגישים לאותיות גדולות/קטנות." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "עליך להתחבר שנית כי פג הזמן המוקצב לך." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "פעולה" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "זמן פעולה" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "מזהה אובייקט" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "ייצוג אובייקט" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "דגל פעולה" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "הערה לשינוי" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "רישום יומן" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "רישומי יומן" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "בוצעה הוספת \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "בוצע שינוי \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "בוצעה מחיקת \"%(object)s\"." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "אובייקט LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "ללא" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s שונה." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ו" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "בוצעה הוספת %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "בוצע שינוי %(list)s עבור %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "בוצעה מחיקת %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "אף שדה לא השתנה." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן לערוך אותו שוב מתחת." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -184,96 +187,96 @@ msgstr "" "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה. ניתן להוסיף עוד %(name)s מתחת." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "הוספת %(name)s \"%(obj)s\" בוצעה בהצלחה." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "עדכון %(name)s \"%(obj)s\" בוצע בהצלחה. ניתן לערוך שוב מתחת." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "עדכון %(name)s \"%(obj)s\" בוצע בהצלחה. ניתן להוסיף עוד %(name)s מתחת." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "שינוי %(name)s \"%(obj)s\" בוצע בהצלחה." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "יש לסמן פריטים כדי לבצע עליהם פעולות. לא שונו פריטים." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "לא נבחרה פעולה." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "הוספת %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "הפריט %(name)s עם המפתח הראשי %(key)r אינו קיים." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "הוספת %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "שינוי %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "שגיאת בסיס נתונים" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "שינוי %(count)s %(name)s בוצע בהצלחה." msgstr[1] "שינוי %(count)s %(name)s בוצע בהצלחה." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s נבחר" msgstr[1] "כל ה־%(total_count)s נבחרו" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 מ %(cnt)s נבחרים" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "מחיקת %(name)s \"%(obj)s\" בוצעה בהצלחה." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "היסטוריית שינוי: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -282,203 +285,212 @@ "מחיקת %(class_name)s %(instance)s תדרוש מחיקת האובייקטים הקשורים והמוגנים " "הבאים: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "כניסה" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ניהול אתר Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ניהול Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "ניהול אתר" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "ניהול %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "תאריך:" - -#: widgets.py:91 -msgid "Time:" -msgstr "שעה:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "חפש" - -#: widgets.py:260 -msgid "Add Another" -msgstr "הוסף עוד אחת" - -#: widgets.py:302 -msgid "Currently:" -msgstr "נוכחי:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "כניסה" -#: widgets.py:303 -msgid "Change:" -msgstr "שינוי:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "ניהול %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "דף לא קיים" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "אנו מצטערים, לא ניתן למצוא את הדף המבוקש." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "דף הבית" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "שגיאת שרת" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "שגיאת שרת (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "שגיאת שרת (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" "התרחשה שגיאה. היא דווחה למנהלי האתר בדוא\"ל ותתוקן בקרוב. תודה על סבלנותך." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "הפעל את הפעולה שבחרת בה." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "בצע" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "לחיצה כאן תבחר את האובייקטים בכל העמודים" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "בחירת כל %(total_count)s ה־%(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "איפוס בחירה" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות " +"עבור המשתמש." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "נא לשים שם משתמש וסיסמה." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "שינוי סיסמה" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "נא לתקן את השגיאות המופיעות מתחת." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "נא לתקן את השגיאות מתחת." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "יש להזין סיסמה חדשה עבור המשתמש %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "סיסמה" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "סיסמה (שוב)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "יש להזין את אותה סיסמה שוב,לאימות." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "שלום," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "תיעוד" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "שינוי סיסמה" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "יציאה" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ניהול אתר Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ניהול Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "הוספה" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "היסטוריה" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "צפיה באתר" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "נא לתקן את השגיאות המופיעות מתחת." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "נא לתקן את השגיאות מתחת." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "הוספת %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "סינון" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "הסרה ממיון" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "עדיפות מיון: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "החלף כיוון מיון" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "מחיקה" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -488,7 +500,7 @@ "מחיקת %(object_name)s '%(escaped_object)s' מצריכה מחיקת אובייקטים מקושרים, " "אך לחשבון שלך אין הרשאות למחיקת סוגי האובייקטים הבאים:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -497,7 +509,7 @@ "מחיקת ה%(object_name)s '%(escaped_object)s' תדרוש מחיקת האובייקטים הקשורים " "והמוגנים הבאים:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -506,16 +518,16 @@ "האם ברצונך למחוק את %(object_name)s \"%(escaped_object)s\"? כל הפריטים " "הקשורים הבאים יימחקו:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "כן, אני בטוח/ה" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "מחק כמה פריטים" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -525,7 +537,7 @@ "מחיקת ב%(objects_name)s הנבחרת תביא במחיקת אובייקטים קשורים, אבל החשבון שלך " "אינו הרשאה למחוק את הסוגים הבאים של אובייקטים:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -534,7 +546,7 @@ "מחיקת ה%(objects_name)s אשר סימנת תדרוש מחיקת האובייקטים הקשורים והמוגנים " "הבאים:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -543,41 +555,56 @@ "האם אתה בטוח שאתה רוצה למחוק את ה%(objects_name)s הנבחר? כל האובייקטים הבאים " "ופריטים הקשורים להם יימחקו:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "להסיר" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "הוספת %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "מחיקה ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " לפי %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "מודלים ביישום %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "שינוי" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "אין לך הרשאות לעריכה." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "פעולות אחרונות" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "הפעולות שלי" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "לא נמצאו" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "תוכן לא ידוע" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -586,139 +613,88 @@ "משהו שגוי בהתקנת בסיס הנתונים שלך. נא לוודא שנוצרו טבלאות בסיס הנתונים " "המתאימות, ובסיס הנתונים ניתן לקריאה על ידי המשתמש המתאים." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "סיסמה:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "שכחת את שם המשתמש והסיסמה שלך ?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "תאריך/שעה" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "משתמש" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "פעולה" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" "לאובייקט זה אין היסטוריית שינוי. כנראה לא השתמשו בממשק הניהול הזה להוספתו." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "הצג הכל" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "שמירה" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "חיפוש" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "תוצאה %(counter)s" msgstr[1] "%(counter)s תוצאות" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s סה\"כ" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "שמירה כחדש" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "שמירה והוספת אחר" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "שמירה והמשך עריכה" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"ראשית יש להזין שם משתמש וסיסמה. לאחר מכן יהיה ביכולתך לערוך אפשרויות נוספות " -"עבור המשתמש." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "נא לשים שם משתמש וסיסמה." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "יש להזין סיסמה חדשה עבור המשתמש %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "סיסמה" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "סיסמה (שוב)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "יש להזין את אותה סיסמה שוב,לאימות." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "להסיר" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "הוספת %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "מחיקה ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "תודה על בילוי זמן איכות עם האתר." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "התחבר/י שוב" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "שינוי סיסמה" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "הסיסמה שונתה בהצלחה" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "סיסמתך שונתה." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -726,64 +702,48 @@ "נא להזין את סיסמתך הישנה, לצרכי אבטחה, ולאחר מכן את סיסמתך החדשה פעמיים כדי " "שנוכל לוודא שהקלדת אותה כראוי." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "סיסמה ישנה" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "סיסמה חדשה" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "שנה את סיסמתי" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "איפוס סיסמה" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "איפוס הסיסמה הושלם" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "ססמתך נשמרה. כעת ניתן להתחבר." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "אימות איפוס סיסמה" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "הזנת סיסמה חדשה" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "נא להזין את סיסמתך החדשה פעמיים כדי שנוכל לוודא שהקלדת אותה כראוי." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "סיסמה חדשה:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "אימות סיסמה:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "איפוס הסיסמה נכשל" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -791,19 +751,14 @@ "הקישור לאיפוס הסיסמה אינו חוקי. ייתכן והשתמשו בו כבר. נא לבקש איפוס סיסמה " "חדש." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "הסיסמה אופסה בהצלחה" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" "שלחנו אליך דוא\"ל עם הוראות לאיפוס הסיסמה. ההוראות אמורות להתקבל בקרוב." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -811,7 +766,7 @@ "אם הדוא\"ל לא הגיע, נא לוודא שהזנת כתובת נכונה בעת הרישום ולבדוק את תיקיית " "דואר הזבל." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -820,24 +775,24 @@ "הודעה זו נשלחה אליך עקב בקשתך לאיפוס הסיסמה עבור המשתמש שלך באתר " "%(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "נא להגיע לעמוד הבא ולבחור סיסמה חדשה:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "שם המשתמש שלך, במקרה ששכחת:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "תודה על השימוש באתר שלנו!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "צוות %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -845,28 +800,52 @@ "שכחת את סיסמתך ? נא להזין את כתובת הדוא\"ל מתחת, ואנו נשלח הוראות לקביעת " "סיסמה חדשה." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "כתובת דוא\"ל:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "אפס את סיסמתי" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "כל התאריכים" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(אין)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "בחירת %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "בחירת %s לשינוי" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "תאריך:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "שעה:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "חפש" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "הוסף עוד אחת" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "נוכחי:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "שינוי:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/hi/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -6,11 +6,11 @@ # Sandeep Satavlekar , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/" "hi/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "उपलब्ध %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "यह उपलब्ध %s की सूची है. आप उन्हें नीचे दिए गए बॉक्स में से चयन करके कुछ को चुन सकते हैं और " "उसके बाद दो बॉक्स के बीच \"चुनें\" तीर पर क्लिक करें." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "इस बॉक्स में टाइप करने के लिए नीचे उपलब्ध %s की सूची को फ़िल्टर करें." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "छानना" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "सभी चुनें" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "एक ही बार में सभी %s को चुनने के लिए क्लिक करें." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "चुनें" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "हटाना" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "चुनें %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "यह उपलब्ध %s की सूची है. आप उन्हें नीचे दिए गए बॉक्स में से चयन करके कुछ को हटा सकते हैं और " "उसके बाद दो बॉक्स के बीच \"हटायें\" तीर पर क्लिक करें." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "सभी को हटाएँ" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "एक ही बार में सभी %s को हटाने के लिए क्लिक करें." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s में से %(sel)s चुना गया हैं" msgstr[1] "%(cnt)s में से %(sel)s चुने गए हैं" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "स्वतंत्र सम्पादनक्षम क्षेत्र/स्तम्भ में किये हुए बदल अभी रक्षित नहीं हैं | अगर आप कुछ कार्रवाई " "करते हो तो वे खो जायेंगे |" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +109,8 @@ "नहीं किये हैं| उन्हें सुरक्षित करने के लिए कृपया 'ओके' क्लिक करे | आप को चुनी हुई कार्रवाई " "दोबारा चलानी होगी |" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -115,68 +119,84 @@ "आप ने कार्रवाई चुनी हैं, और आप ने स्वतंत्र सम्पादनक्षम क्षेत्र/स्तम्भ में बदल नहीं किये हैं| " "संभवतः 'सेव' बटन के बजाय आप 'गो' बटन ढून्ढ रहे हो |" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "जनवरी फ़रवरी मार्च अप्रैल मई जून जुलाई अगस्त सेप्टम्बर अक्टूबर नवंबर दिसम्‍बर" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "आ सो म बु गु शु श" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "दिखाओ" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr " छिपाओ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "अब" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "घड़ी" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "एक समय चुनें" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "मध्यरात्री" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "सुबह 6 बजे" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "दोपहर" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "रद्द करें" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "आज" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "तिथि-पत्र " -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "कल (बीता)" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "कल" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "जनवरी फ़रवरी मार्च अप्रैल मई जून जुलाई अगस्त सेप्टम्बर अक्टूबर नवंबर दिसम्‍बर" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "आ सो म बु गु शु श" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "दिखाओ" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr " छिपाओ" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/hi/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/hi/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/hi/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/hi/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/hi/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,18 @@ # 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 # Sandeep Satavlekar , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 16:15+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Hindi (http://www.transifex.com/projects/p/django/language/" "hi/)\n" "MIME-Version: 1.0\n" @@ -21,62 +21,68 @@ "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s सफलतापूर्वक हटा दिया गया है| |" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s नहीं हटा सकते" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "क्या आप निश्चित हैं?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "चुने हुए %(verbose_name_plural)s हटा दीजिये " -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "सभी" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "हाँ" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "नहीं" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "अनजान" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "कोई भी तारीख" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "आज" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "पिछले 7 दिन" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "इस महीने" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "इस साल" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,101 +91,98 @@ "कृपया कर्मचारी खाते का सही %(username)s व कूटशब्द भरें। भरते समय दीर्घाक्षर और लघु अक्षर " "का खयाल रखें।" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "कृपया फिर से प्रवेश करें, क्योंकि आपका सत्र समाप्त हो गया है |" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr " क्रिया:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "कार्य समय" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "वस्तु आई डी " -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "वस्तु प्रतिनिधित्व" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "कार्य ध्वज" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "परिवर्तन सन्देश" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "लॉग प्रविष्टि" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "लॉग प्रविष्टियाँ" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" को जोड़ा गया." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "परिवर्तित \"%(object)s\" - %(changes)s " -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" को नष्ट कर दिया है." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry ऑब्जेक्ट" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "कोई नहीं" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s को बदला गया हैं" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "और" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" को जोडा गया हैं" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" की %(list)s बदला गया है" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" निकाला गया है" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "कोई क्षेत्र नहीं बदला" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" कामयाबी से जोडा गया हैं । आप इसे फिर से संपादित कर सकते हैं" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,12 +191,12 @@ " %(name)s \"%(obj)s\" सफलतापूर्वक जोड़ दिया गया। आप चाहें तो नीचे एक और %(name)s " "जोड़ सकते हैं।" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" को कामयाबी से जोडा गया है" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ msgstr "" " %(name)s \"%(obj)s\" सफलतापूर्वक जोड़ दिया गया। आप चाहें तो नीचे इसे बदल भी सकते हैं।" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,162 +213,148 @@ " %(name)s \"%(obj)s\" सफलतापूर्वक बदल दिया गया। आप चाहें तो नीचे एक और %(name)s " "जोड़ सकते हैं।" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" को कामयाबी से बदला गया हैं" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "कार्रवाई हेतु आयटम सही अनुक्रम में चुने जाने चाहिए | कोई आइटम नहीं बदले गये हैं." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "कोई कार्रवाई नहीं चुनी है |" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s बढाएं" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" को कामयाबी से निकाला गया है" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s नामक कोई वस्तू जिस की प्राथमिक कुंजी %(key)r हो, अस्तित्व में नहीं हैं |" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s बढाएं" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s बदलो" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "डेटाबेस त्रुटि" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s का परिवर्तन कामयाब हुआ |" msgstr[1] "%(count)s %(name)s का परिवर्तन कामयाब हुआ |" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s चुने" msgstr[1] "सभी %(total_count)s चुने " -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s में से 0 चुने" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" को कामयाबी से निकाला गया है" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "इतिहास बदलो: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"%(object_name)s को हटाने के लिए '%(escaped_object)s' को निम्नलिखित संरक्षित संबंधित " -"वस्तुओं को हटाने की आवश्यकता होगी:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "लॉगिन" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ज्याँगो साइट प्रशासन" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ज्याँगो प्रशासन" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "साइट प्रशासन" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s प्रशासन" - -#: widgets.py:90 -msgid "Date:" -msgstr "तिथि:" - -#: widgets.py:91 -msgid "Time:" -msgstr "समय:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "लुक अप" - -#: widgets.py:260 -msgid "Add Another" -msgstr "अन्य बढाएं" - -#: widgets.py:302 -msgid "Currently:" -msgstr "फ़िलहाल - " +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "लॉगिन" -#: widgets.py:303 -msgid "Change:" -msgstr "बदलाव -" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "पृष्ठ लापता" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "क्षमा कीजिए पर निवेदित पृष्ठ लापता है ।" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "गृह" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "सर्वर त्रुटि" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "सर्वर त्रुटि (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "सर्वर त्रुटि (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -373,120 +362,141 @@ "एक त्रुटि मिली है। इसकी जानकारी स्थल के संचालकों को डाक द्वारा दे दी गई है, और यह जल्द " "ठीक हो जानी चाहिए। धीरज रखने के लिए शुक्रिया।" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "चयनित कार्रवाई चलाइये" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "आगे बढ़े" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "सभी पृष्ठों पर मौजूद वस्तुओं को चुनने के लिए यहाँ क्लिक करें " -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "तमाम %(total_count)s %(module_name)s चुनें" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "चयन खालिज किया जाये " -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"पहले प्रदवोक्ता नाम और कूटशब्द दर्ज करें । उसके पश्चात ही आप अधिक प्रवोक्ता विकल्प बदल " +"सकते हैं ।" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "उपयोगकर्ता का नाम और कूटशब्द दर्ज करें." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "कूटशब्द बदलें" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "कृपया नीचे पायी गयी गलतियाँ ठीक करें ।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s प्रवोक्ता के लिए नयी कूटशब्द दर्ज करें ।" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "कूटशब्द" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "शब्दकूट (दुबारा)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "सत्याप्ती के लिए ऊपर दर्ज किए कूटशब्द को फिर से प्रवेश करें" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "आपका स्वागत है," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "दस्तावेज़ीकरण" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "कूटशब्द बदलें" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "लॉग आउट" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ज्याँगो साइट प्रशासन" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ज्याँगो प्रशासन" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "बढाएं" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "इतिहास" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "साइट पे देखें" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "कृपया नीचे पायी गयी गलतियाँ ठीक करें ।" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s बढाएं" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "छन्नी" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "श्रेणीकरण से हटाये " -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "श्रेणीकरण प्राथमिकता : %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "टॉगल श्रेणीकरण" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "मिटाएँ" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -496,7 +506,7 @@ "%(object_name)s '%(escaped_object)s' को मिटाने पर सम्बंधित वस्तुएँ भी मिटा दी " "जाएगी, परन्तु आप के खाते में निम्नलिखित प्रकार की वस्तुओं को मिटाने की अनुमति नहीं हैं |" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -505,7 +515,7 @@ "%(object_name)s '%(escaped_object)s' को हटाने के लिए उनसे संबंधित निम्नलिखित " "संरक्षित वस्तुओं को हटाने की आवश्यकता होगी:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -514,16 +524,16 @@ "क्या आप %(object_name)s \"%(escaped_object)s\" हटाना चाहते हैं? निम्नलिखित सभी " "संबंधित वस्तुएँ नष्ट की जाएगी" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "हाँ, मैंने पक्का तय किया हैं " -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "अनेक वस्तुएं हटाएँ" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -533,7 +543,7 @@ "चयनित %(objects_name)s हटाने पर उस से सम्बंधित वस्तुएं भी हट जाएगी, परन्तु आपके खाते में " "वस्तुओं के निम्नलिखित प्रकार हटाने की अनुमति नहीं है:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -542,7 +552,7 @@ "चयनित %(objects_name)s को हटाने के पश्चात् निम्नलिखित संरक्षित संबंधित वस्तुओं को हटाने " "की आवश्यकता होगी |" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -551,41 +561,56 @@ "क्या आप ने पक्का तय किया हैं की चयनित %(objects_name)s को नष्ट किया जाये ? " "निम्नलिखित सभी वस्तुएं और उनसे सम्बंधित वस्तुए भी नष्ट की जाएगी:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "निकालें" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "एक और %(verbose_name)s जोड़ें " + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "मिटाएँ ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s द्वारा" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s अनुप्रयोग के प्रतिरूप" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "बदलें" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "आपके पास कुछ भी संपादन करने के लिये अनुमति नहीं है ।" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "हाल क्रियाएँ" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "मेरे कार्य" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr " कोई भी उपलब्ध नहीं" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "अज्ञात सामग्री" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -594,27 +619,27 @@ "अपने डेटाबेस स्थापना के साथ कुछ गलत तो है | सुनिश्चित करें कि उचित डेटाबेस तालिका बनायीं " "गयी है, और सुनिश्चित करें कि डेटाबेस उपयुक्त उपयोक्ता के द्वारा पठनीय है |" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "कूटशब्द" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "अपना पासवर्ड या उपयोगकर्ता नाम भूल गये हैं?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "तिथि / समय" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "उपभोक्ता" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "कार्य" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -622,112 +647,61 @@ "इस वस्तु का बदलाव इतिहास नहीं है. शायद वह इस साइट व्यवस्थापक के माध्यम से नहीं जोड़ा " "गया है." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "सभी दिखाएँ" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "सुरक्षित कीजिये" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "खोज" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s परिणाम" msgstr[1] "%(counter)s परिणाम" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s कुल परिणाम" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "नये सा सहेजें" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "सहेजें और एक और जोडें" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "सहेजें और संपादन करें" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"पहले प्रदवोक्ता नाम और कूटशब्द दर्ज करें । उसके पश्चात ही आप अधिक प्रवोक्ता विकल्प बदल " -"सकते हैं ।" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "उपयोगकर्ता का नाम और कूटशब्द दर्ज करें." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s प्रवोक्ता के लिए नयी कूटशब्द दर्ज करें ।" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "कूटशब्द" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "शब्दकूट (दुबारा)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "सत्याप्ती के लिए ऊपर दर्ज किए कूटशब्द को फिर से प्रवेश करें" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "निकालें" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "एक और %(verbose_name)s जोड़ें " - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "मिटाएँ ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "आज हमारे वेब साइट पर आने के लिए धन्यवाद ।" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "फिर से लॉगिन कीजिए" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "कूटशब्द बदलें" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "कूटशब्द कदली कामयाब" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "आपके कूटशब्द को बदला गया है" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -735,64 +709,48 @@ "सुरक्षा कारणों के लिए कृपया पुराना कूटशब्द दर्ज करें । उसके पश्चात नए कूटशब्द को दो बार दर्ज " "करें ताकि हम उसे सत्यापित कर सकें ।" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "पुराना कूटशब्द " -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "नया कूटशब्द " -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "कूटशब्द बदलें" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "कूटशब्द पुनस्थाप" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "कूटशब्द पुनस्थाप कामयाब" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "आपके कूटशब्द को स्थापित किया गया है । अब आप लॉगिन कर सकते है ।" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "कूटशब्द पुष्टि" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "नया कूटशब्द दीजिएं" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "कृपया आपके नये कूटशब्द को दो बार दर्ज करें ताकि हम उसकी सत्याप्ती कर सकते है ।" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "नया कूटशब्द " -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "कूटशब्द पुष्टि कीजिए" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "कूटशब्द पुनस्थाप असफल" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -800,12 +758,7 @@ "कूटशब्द पुनस्थाप संपर्क अमान्य है, संभावना है कि उसे उपयोग किया गया है। कृपया फिर से कूटशब्द " "पुनस्थाप की आवेदन करें ।" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "कूटशब्द पुनस्थाप सफल" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -813,7 +766,7 @@ "हमने आपके डाक पते पर कूटशब्द स्थापित करने के निर्देश भेजे है । थोडी ही देर में ये आपको मिल " "जाएँगे।" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -821,7 +774,7 @@ "अगर आपको कोई ईमेल प्राप्त नई होता है,यह ध्यान रखे की आपने सही पता रजिस्ट्रीकृत किया है " "और आपने स्पॅम फोल्डर को जाचे|" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -830,52 +783,76 @@ "आपको यह डाक इसलिए आई है क्योंकि आप ने %(site_name)s पर अपने खाते का कूटशब्द बदलने का " "अनुरोध किया था |" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "कृपया निम्नलिखित पृष्ठ पर नया कूटशब्द चुनिये :" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "आपका प्रवोक्ता नाम, यदि भूल गये हों :" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "हमारे साइट को उपयोग करने के लिए धन्यवाद ।" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s दल" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" "कूटशब्द भूल गए? नीचे अपना डाक पता भरें, वहाँ पर हम आपको नया कूटशब्द रखने के निर्देश भेजेंगे।" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "डाक पता -" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr " मेरे कूटशब्द की पुनःस्थापना" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "सभी तिथियों" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(कोई नहीं)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s चुनें" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s के बदली के लिए चयन करें" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "तिथि:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "समय:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "लुक अप" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "अन्य बढाएं" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "फ़िलहाल - " + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "बदलाव -" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/hr/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,11 +7,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/" "hr/)\n" "MIME-Version: 1.0\n" @@ -21,12 +21,12 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Dostupno %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +35,38 @@ "Ovo je popis dostupnih %s. Možete dodati pojedine na način da ih izaberete u " "polju ispod i kliknete \"Izaberi\" strelicu između dva polja. " -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Tipkajte u ovo polje da filtrirate listu dostupnih %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Odaberi sve" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Kliknite da odabrete sve %s odjednom." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Izaberi" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Ukloni" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Odabrano %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,23 +75,25 @@ "Ovo je popis odabranih %s. Možete ukloniti pojedine na način da ih izaberete " "u polju ispod i kliknete \"Ukloni\" strelicu između dva polja. " -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Ukloni sve" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Kliknite da uklonite sve izabrane %s odjednom." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "odabrano %(sel)s od %(cnt)s" msgstr[1] "odabrano %(sel)s od %(cnt)s" msgstr[2] "odabrano %(sel)s od %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +101,8 @@ "Neke promjene nisu spremljene na pojedinim polja za uređivanje. Ako " "pokrenete akciju, nespremljene promjene će biti izgubljene." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "Odabrali ste akciju, ali niste još spremili promjene na pojedinim polja. " "Molimo kliknite OK za spremanje. Morat ćete ponovno pokrenuti akciju." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +121,88 @@ "Odabrali ste akciju, a niste napravili nikakve izmjene na pojedinim poljima. " "Vjerojatno tražite gumb Idi umjesto gumb Spremi." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Siječanj Veljača Ožujak Travanj Svibanj Lipanj Srpanj Kolovoz Rujan Listopad " -"Studeni Prosinac" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "N P U S Č P S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Prikaži" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Sakri" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Sada" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Sat" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Izaberite vrijeme" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Ponoć" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 ujutro" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Podne" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Odustani" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Danas" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendar" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Jučer" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Sutra" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Siječanj Veljača Ožujak Travanj Svibanj Lipanj Srpanj Kolovoz Rujan Listopad " +"Studeni Prosinac" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "N P U S Č P S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Prikaži" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Sakri" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/hr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/hr/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/hr/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/hr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/hr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,15 +4,15 @@ # aljosa , 2011,2013 # Bojan Mihelač , 2012 # Jannis Leidel , 2011 -# mislav , 2013 +# Mislav Cimperšak , 2013 # Ylodi , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-28 14:36+0000\n" -"Last-Translator: mislav \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Croatian (http://www.transifex.com/projects/p/django/language/" "hr/)\n" "MIME-Version: 1.0\n" @@ -22,62 +22,68 @@ "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspješno izbrisano %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Nije moguće izbrisati %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Jeste li sigurni?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izbrišite odabrane %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Svi" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Da" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nepoznat pojam" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Bilo koji datum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Danas" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Prošlih 7 dana" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ovaj mjesec" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ova godina" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -86,100 +92,97 @@ "Molimo unesite ispravno %(username)s i lozinku za pristup. Imajte na umu da " "oba polja mogu biti velika i mala slova." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Molim prijavite se ponovo jer je vaš session istekao." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Akcija:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "vrijeme akcije" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id objekta" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr objekta" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "oznaka akcije" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "promijeni poruku" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "zapis" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "zapisi" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Dodano \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Promijenjeno \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Obrisano \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Log zapis" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nijedan" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Promijenjeno %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "i" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodano %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Promijeni %(list)s za %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Izbrisani %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nije bilo promjena polja." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" uspješno dodan. Možete ponovo urediti unos dolje." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,12 +191,12 @@ "Unos %(name)s \"%(obj)s\" je uspješno dodan. Možete dodati još jedan unos " "(%(name)s) u nastavku." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" uspješno je dodano." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -202,7 +205,7 @@ "Unos %(name)s \"%(obj)s\" je uspješno promijenjen. Možete ga urediti ponovno " "ispod." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -211,12 +214,12 @@ "Unos %(name)s \"%(obj)s\" je uspješno promijenjen. Možete dodati još jedan " "(%(name)s) u nastavku." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" uspješno promijenjeno." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -224,30 +227,35 @@ "Unosi moraju biti odabrani da bi se nad njima mogle izvršiti akcije. Nijedan " "unos nije promijenjen." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nije odabrana akcija." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Novi unos (%s)" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" uspješno izbrisan." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Unos %(name)s sa primarnim ključem %(key)r ne postoji." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Novi unos (%s)" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Promijeni %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Pogreška u bazi" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -255,7 +263,7 @@ msgstr[1] "%(count)s %(name)s uspješno promijenjeno." msgstr[2] "%(count)s %(name)s uspješno promijenjeno." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -263,112 +271,95 @@ msgstr[1] "Svih %(total_count)s odabrano" msgstr[2] "Svih %(total_count)s odabrano" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s odabrano" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" uspješno izbrisan." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Promijeni povijest: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Prijavi se" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administracija stranica" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administracija" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administracija stranica" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administracija" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Vrijeme:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Potraži" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Unesi još" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Trenutno:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Prijavi se" -#: widgets.py:303 -msgid "Change:" -msgstr "Promijeni:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Stranica nije pronađena" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Ispričavamo se, ali tražena stranica nije pronađena." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Početna" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Greška na serveru" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Greška na serveru (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Greška na serveru (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -376,120 +367,141 @@ "Dogodila se greška. Administratori su obaviješteni putem elektroničke pošte " "te bi greška uskoro trebala biti ispravljena. Hvala na strpljenju." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Izvrši odabranu akciju" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Idi" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klikni ovdje da bi odabrao unose kroz sve stranice" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Odaberi svih %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Očisti odabir" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Prvo, unesite korisničko ime i lozinku. Onda možete promijeniti više " +"postavki korisnika." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Unesite korisničko ime i lozinku." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Promijeni lozinku" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Molimo ispravite navedene greške." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Molimo ispravite navedene greške." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Unesite novu lozinku za korisnika %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Lozinka" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Lozinka (unesi ponovo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Unesite istu lozinku, za potvrdu." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Dobrodošli," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentacija" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Promijeni lozinku" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Odjava" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administracija stranica" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administracija" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Novi unos" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Povijest" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Pogledaj na stranicama" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Molimo ispravite navedene greške." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Molimo ispravite navedene greške." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Novi unos - %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Odstrani iz sortiranja" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritet sortiranja: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Preklopi sortiranje" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Izbriši" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -499,7 +511,7 @@ "Brisanje %(object_name)s '%(escaped_object)s' rezultiralo bi brisanjem " "povezanih objekta, ali vi nemate privilegije za brisanje navedenih objekta: " -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -508,7 +520,7 @@ "Brisanje %(object_name)s '%(escaped_object)s' bi zahtijevalo i brisanje " "sljedećih zaštićenih povezanih objekata:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -517,16 +529,16 @@ "Jeste li sigurni da želite izbrisati %(object_name)s \"%(escaped_object)s\"? " "Svi navedeni objekti biti će izbrisani:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Da, siguran sam" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Izbriši više unosa." -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -537,7 +549,7 @@ "objekta, ali vaš korisnički račun nema dozvolu za brisanje sljedeće vrste " "objekata:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -546,7 +558,7 @@ "Brisanje odabranog %(objects_name)s će zahtijevati brisanje sljedećih " "zaštićenih povezanih objekata:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -555,41 +567,56 @@ "Jeste li sigurni da želite izbrisati odabrane %(objects_name)s ? Svi " "sljedeći objekti i povezane stavke će biti izbrisani:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Ukloni" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Dodaj još jedan %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Izbriši?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Po %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modeli u aplikaciji %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Promijeni" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nemate privilegije za promjenu podataka." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Nedavne promjene" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Moje promjene" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nije dostupno" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Sadržaj nepoznat" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +625,27 @@ "Nešto nije uredu sa instalacijom/postavkama baze. Provjerite jesu li " "potrebne tablice u bazi kreirane i provjerite je li baza dostupna korisniku." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Lozinka:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Zaboravili ste lozinku ili korisničko ime?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/vrijeme" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Korisnik" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Akcija" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,19 +653,20 @@ "Ovaj objekt nema povijest promjena. Moguće je da nije dodan korištenjem ove " "administracije." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Prikaži sve" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Spremi" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Traži" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -646,93 +674,41 @@ msgstr[1] "%(counter)s rezultata" msgstr[2] "%(counter)s rezultata" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s ukupno" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Spremi kao novi unos" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Spremi i unesi novi unos" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Spremi i nastavi uređivati" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Prvo, unesite korisničko ime i lozinku. Onda možete promijeniti više " -"postavki korisnika." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Unesite korisničko ime i lozinku." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Unesite novu lozinku za korisnika %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Lozinka" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Lozinka (unesi ponovo)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Unesite istu lozinku, za potvrdu." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Ukloni" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Dodaj još jedan %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Izbriši?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Hvala što ste proveli malo kvalitetnog vremena na stranicama danas." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Prijavite se ponovo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Promjena lozinke" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Promjena lozinke uspješna" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Vaša lozinka je promijenjena." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -740,46 +716,34 @@ "Molim unesite staru lozinku, zbog sigurnosti, i onda unesite novu lozinku " "dvaput da bi mogli provjeriti jeste li je ispravno unijeli." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Stara lozinka" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nova lozinka" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Promijeni moju lozinku" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Resetiranje lozinke" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Resetiranje lozinke završeno" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Vaša lozinka je postavljena. Sada se možete prijaviti." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potvrda promjene lozinke" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Unesite novu lozinku" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -787,19 +751,15 @@ "Molimo vas da unesete novu lozinku dvaput da bi mogli provjeriti jeste li je " "ispravno unijeli." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nova lozinka:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potvrdi lozinku:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Resetiranje lozinke neuspješno" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,24 +767,19 @@ "Link za resetiranje lozinke je neispravan, vjerojatno jer je već korišten. " "Molimo zatražite novo resetiranje lozinke." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Resetiranje lozinke uspješno" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -833,24 +788,24 @@ "Primili ste ovu poruku jer ste zatražili postavljanje nove lozinke za svoj " "korisnički račun na %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Molimo otiđite do sljedeće stranice i odaberite novu lozinku:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Vaše korisničko ime, u slučaju da ste zaboravili:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Hvala šta koristite naše stranice!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s tim" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -858,28 +813,52 @@ "Zaboravili ste lozinku? Unesite vašu e-mail adresu ispod i poslati ćemo vam " "upute kako postaviti novu." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-mail adresa:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Resetiraj moju lozinku" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Svi datumi" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nijedan)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Odaberi %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Odaberi za promjenu - %s" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Vrijeme:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Potraži" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Unesi još" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Trenutno:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Promijeni:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/hu/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/django/" "language/hu/)\n" "MIME-Version: 1.0\n" @@ -21,12 +21,12 @@ "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Elérhető %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +35,38 @@ "Ez az elérhető %s listája. Úgy választhat közülük, hogy rákattint az alábbi " "dobozban, és megnyomja a dobozok közti \"Választás\" nyilat." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Írjon a mezőbe az elérhető %s szűréséhez." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Szűrő" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Mindet kijelölni" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Kattintson az összes %s kiválasztásához." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Választás" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Eltávolítás" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s kiválasztva" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,22 +75,24 @@ "Ez a kiválasztott %s listája. Eltávolíthat közülük, ha rákattint, majd a két " "doboz közti \"Eltávolítás\" nyílra kattint." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Összes törlése" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Kattintson az összes %s eltávolításához." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s/%(cnt)s kijelölve" msgstr[1] "%(sel)s/%(cnt)s kijelölve" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +100,8 @@ "Még el nem mentett módosításai vannak egyes szerkeszthető mezőkön. Ha most " "futtat egy műveletet, akkor a módosítások elvesznek." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "módosításait. Kattintson az OK gombra a mentéshez. Újra kell futtatnia az " "műveletet." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +121,86 @@ "Kiválasztott egy műveletet, és nem módosított egyetlen mezőt sem. " "Feltehetően a Mehet gombot keresi a Mentés helyett." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"január február március április május június július augusztus szeptember " -"október november december" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "V H K Sz Cs P Szo" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mutat" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Elrejt" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Most" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Óra" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Válassza ki az időt" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Éjfél" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "Reggel 6 óra" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Dél" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Mégsem" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Ma" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Naptár" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Tegnap" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Holnap" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"január február március április május június július augusztus szeptember " +"október november december" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "V H K Sz Cs P Szo" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mutat" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Elrejt" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/hu/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/hu/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/hu/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/hu/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/hu/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,10 +7,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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Hungarian (http://www.transifex.com/projects/p/django/" "language/hu/)\n" @@ -20,62 +20,68 @@ "Language: hu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s sikeresen törölve lett." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s törlése nem sikerült" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Biztos benne?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Kiválasztott %(verbose_name_plural)s törlése" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Mind" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Igen" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nem" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Ismeretlen" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Bármely dátum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Ma" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Utolsó 7 nap" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ez a hónap" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ez az év" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,100 +90,97 @@ "Adja meg egy adminisztrációra jogosult %(username)s és jelszavát. Vegye " "figyelembe, hogy mindkét mező megkülönböztetheti a kis- és nagybetűket." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Jelentkezzen be újra, mert a munkamenete lejárt." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Művelet:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "művelet időpontja" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objektum id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objektum repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "művelet jelölés" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "üzenet módosítása" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "naplóbejegyzés" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "naplóbejegyzések" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" hozzáadva." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" megváltoztatva: %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" törölve." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Naplóbejegyzés objektum" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Egyik sem" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s módosítva." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "és" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s létrehozva." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s tulajdonságai (%(list)s) megváltoztak." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s törlésre került." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Egy mező sem változott." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva. Alább ismét szerkesztheti." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -186,19 +189,19 @@ "\"%(obj)s\" %(name)s sikeresen létrehozva. Alább újabb %(name)s hozható " "létre." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "\"%(obj)s\" %(name)s sikeresen létrehozva. Alább ismét szerkeszthető." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -206,12 +209,12 @@ msgstr "" "\"%(obj)s\" %(name)s sikeresen módosítva. Alább újabb %(name)s hozható létre." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "\"%(obj)s\" %(name)s sikeresen módosítva." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -219,149 +222,137 @@ "A műveletek végrehajtásához ki kell választani legalább egy elemet. Semmi " "sem lett módosítva." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nem választott ki műveletet." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Új %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "\"%(obj)s\" %(name)s sikeresen törölve." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objektum %(key)r elsődleges kulccsal nem létezik." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Új %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s módosítása" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Adatbázishiba" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s sikeresen módosítva lett." msgstr[1] "%(count)s %(name)s sikeresen módosítva lett." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s kiválasztva" msgstr[1] "%(total_count)s kiválasztva" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 kiválasztva ennyiből: %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "\"%(obj)s\" %(name)s sikeresen törölve." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Változások története: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Bejelentkezés" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django honlapadminisztráció" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django adminisztráció" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Honlap karbantartása" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s adminisztráció" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dátum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Idő:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Keresés" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Újabb hozzáadása" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Jelenleg:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Bejelentkezés" -#: widgets.py:303 -msgid "Change:" -msgstr "Módosítás:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Nincs ilyen oldal" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Sajnáljuk, de a kért oldal nem található." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Kezdőlap" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Szerverhiba" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Szerverhiba (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Szerverhiba (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -369,120 +360,142 @@ "Hiba történt, melyet e-mailben jelentettünk az oldal karbantartójának. A " "rendszer remélhetően hamar megjavul. Köszönjük a türelmét." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Kiválasztott művelet futtatása" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Mehet" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kattintson ide több oldalnyi objektum kiválasztásához" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Az összes %(module_name)s kiválasztása, összesen %(total_count)s db" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Kiválasztás törlése" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Először adjon meg egy felhasználói nevet és egy jelszót. Ezek után további " +"módosításokat is végezhet a felhasználó adatain." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Írjon be egy felhasználónevet és jelszót." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Jelszó megváltoztatása" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Kérem, javítsa az alábbi hibákat." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Adjon meg egy új jelszót %(username)s nevű felhasználónak." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Jelszó" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Jelszó újra" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Írja be a fenti jelszót ellenőrzés céljából." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Üdvözlöm," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentáció" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Jelszó megváltoztatása" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Kijelentkezés" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django honlapadminisztráció" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django adminisztráció" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Új" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Történet" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Megtekintés a honlapon" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Kérem, javítsa az alábbi hibákat." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Új %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Szűrő" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Eltávolítás a rendezésből" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritás rendezésnél: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Rendezés megfordítása" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Törlés" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -493,7 +506,7 @@ "törlését is eredményezi, de a hozzáférése nem engedi a következő típusú " "objektumok törlését:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -502,7 +515,7 @@ "\"%(escaped_object)s\" %(object_name)s törlése az alábbi kapcsolódó " "objektumok törlését is maga után vonja:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -511,16 +524,16 @@ "Biztos hogy törli a következőt: \"%(escaped_object)s\" (típus: " "%(object_name)s)? A összes további kapcsolódó elem is törlődik:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Igen, biztos vagyok benne" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Több elem törlése" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -531,7 +544,7 @@ "maga után, de az alábbi objektumtípusok törléséhez nincs megfelelő " "jogosultsága:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -540,7 +553,7 @@ "A kiválasztott %(objects_name)s törlése az alábbi védett kapcsolódó " "objektumok törlését is maga után vonja:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -549,41 +562,56 @@ "Biztosan törölni akarja a kiválasztott %(objects_name)s objektumokat? Minden " "alábbi objektum, és a hozzájuk kapcsolódóak is törlésre kerülnek:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Törlés" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Újabb %(verbose_name)s hozzáadása" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Törli?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s szerint " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s alkalmazásban elérhető modellek." -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Módosítás" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nincs joga szerkeszteni." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Utolsó műveletek" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Az én műveleteim" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nincs elérhető" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Ismeretlen tartalom" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -593,139 +621,87 @@ "a megfelelő táblák létre lettek-e hozva, és hogy a megfelelő felhasználó " "tudja-e őket olvasni." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Jelszó:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Elfelejtette jelszavát vagy felhasználónevét?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dátum/idő" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Felhasználó" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Művelet" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "Honlap karbantartása" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mutassa mindet" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Mentés" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Keresés" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s találat" msgstr[1] "%(counter)s találat" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s összesen" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Mentés újként" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Mentés és másik hozzáadása" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Mentés és a szerkesztés folytatása" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Először adjon meg egy felhasználói nevet és egy jelszót. Ezek után további " -"módosításokat is végezhet a felhasználó adatain." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Írjon be egy felhasználónevet és jelszót." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Adjon meg egy új jelszót %(username)s nevű felhasználónak." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Jelszó" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Jelszó újra" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Írja be a fenti jelszót ellenőrzés céljából." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Törlés" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Újabb %(verbose_name)s hozzáadása" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Törli?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Köszönjük hogy egy kis időt eltöltött ma a honlapunkon." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Jelentkezzen be újra" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Jelszó megváltoztatása" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Sikeres jelszóváltoztatás" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Megváltozott a jelszava." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -733,46 +709,34 @@ "Írja be a régi jelszavát biztonsági okokból, majd az újat kétszer, hogy " "biztosan ne gépelje el." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Régi jelszó" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Új jelszó" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Jelszavam megváltoztatása" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Jelszó beállítása" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Jelszó beállítása kész" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Jelszava beállításra került. Most már bejelentkezhet." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Jelszó beállítás megerősítése" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Írja be az új jelszavát" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -780,19 +744,15 @@ "Írja be az új jelszavát kétszer, hogy megbizonyosodhassunk annak " "helyességéről." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Új jelszó:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Jelszó megerősítése:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Jelszó beállítása sikertelen" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -800,12 +760,7 @@ "A jelszóbeállító link érvénytelen. Ennek egyik oka az lehet, hogy már " "felhasználták. Kérem indítson új jelszóbeállítást." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Sikeres jelszótörlés" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -813,7 +768,7 @@ "Az információkat elküldtük e-mailben a megadott címre. Hamarosan meg kell " "érkeznie." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -821,7 +776,7 @@ "Amennyiben nem kapta meg az e-mailt, ellenőrizze, hogy ezzel a címmel " "regisztrált-e, valamint hogy nem került-e a levélszemét mappába." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -830,24 +785,24 @@ "Azért kapja ezt az e-mailt, mert jelszavának visszaállítását kérte ezen a " "weboldalon: %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Kérjük látogassa meg a következő oldalt, és válasszon egy új jelszót:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Felhasználóneve, ha elfelejtette volna:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Köszönjük, hogy használta honlapunkat!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s csapat" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -855,28 +810,52 @@ "Elfelejtette a jelszavát? Írja be az e-mail címét, és küldünk egy levelet a " "teendőkről." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-mail cím:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Jelszavam törlése" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Minden dátum" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(nincs)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s kiválasztása" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Válasszon ki egyet a módosításhoz (%s)" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dátum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Idő:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Keresés" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Újabb hozzáadása" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Jelenleg:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Módosítás:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ia/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/django/" "language/ia/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s disponibile" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -31,38 +31,38 @@ "Ecce le lista de %s disponibile. Tu pote seliger alcunes in le quadro " "sequente; postea clicca le flecha \"Seliger\" inter le duo quadros." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Scribe in iste quadro pro filtrar le lista de %s disponibile." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtrar" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Seliger totes" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Clicca pro seliger tote le %s immediatemente." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Seliger" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Remover" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Le %s seligite" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -71,22 +71,24 @@ "Ecce le lista de %s seligite. Tu pote remover alcunes per seliger los in le " "quadro sequente e cliccar le flecha \"Remover\" inter le duo quadros." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Remover totes" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Clicca pro remover tote le %s seligite immediatemente." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s seligite" msgstr[1] "%(sel)s de %(cnt)s seligite" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -94,7 +96,8 @@ "Il ha cambiamentos non salveguardate in certe campos modificabile. Si tu " "exeque un action, iste cambiamentos essera perdite." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -104,7 +107,8 @@ "certe campos. Per favor clicca OK pro salveguardar los. Tu debera re-exequer " "le action." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -113,70 +117,86 @@ "Tu ha seligite un action, e tu non ha facite cambiamentos in alcun campo. Tu " "probabilemente cerca le button Va e non le button Salveguardar." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januario Februario Martio April Maio Junio Julio Augusto Septembre Octobre " -"Novembre Decembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M J V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Monstrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Celar" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Ora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Horologio" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Selige un hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Medienocte" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mediedie" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancellar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hodie" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendario" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Heri" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Deman" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januario Februario Martio April Maio Junio Julio Augusto Septembre Octobre " +"Novembre Decembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M J V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Monstrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Celar" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ia/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ia/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ia/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ia/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ia/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Interlingua (http://www.transifex.com/projects/p/django/" "language/ia/)\n" @@ -17,156 +17,159 @@ "Language: ia\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s delite con successo." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Non pote deler %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Es tu secur?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Deler le %(verbose_name_plural)s seligite" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Totes" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Si" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Incognite" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Omne data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hodie" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Ultime 7 dies" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Iste mense" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Iste anno" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Per favor aperi session de novo, perque tu session ha expirate." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Action:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora de action" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id de objecto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr de objecto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "marca de action" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "message de cambio" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrata de registro" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entratas de registro" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" addite." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" cambiate - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" delite." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objecto LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nulle" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s cambiate." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "e" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" addite." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s cambiate pro %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" delite." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nulle campo cambiate." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -174,38 +177,38 @@ "Le %(name)s \"%(obj)s\" ha essite addite con successo. Tu pote modificar lo " "de novo hic infra." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Le %(name)s \"%(obj)s\" ha essite addite con successo." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Le %(name)s \"%(obj)s\" ha essite cambiate con successo." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -213,268 +216,278 @@ "Es necessari seliger elementos pro poter exequer actiones. Nulle elemento ha " "essite cambiate." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nulle action seligite." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Adder %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Le %(name)s \"%(obj)s\" ha essite delite con successo." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Le objecto %(name)s con le clave primari %(key)r non existe." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Adder %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Cambiar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Error in le base de datos" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s cambiate con successo." msgstr[1] "%(count)s %(name)s cambiate con successo." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s seligite" msgstr[1] "Tote le %(total_count)s seligite" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s seligite" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Le %(name)s \"%(obj)s\" ha essite delite con successo." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historia de cambiamentos: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Aperir session" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Administration del sito Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administration de Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administration del sito" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administration de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Recerca" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Adder un altere" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Aperir session" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Pagina non trovate" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Regrettabilemente, le pagina requestate non poteva esser trovate." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Initio" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Error del servitor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Error del servitor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Error del servitor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Exequer le action seligite" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Va" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Clicca hic pro seliger le objectos in tote le paginas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seliger tote le %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Rader selection" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primo, specifica un nomine de usator e un contrasigno. Postea, tu potera " +"modificar plus optiones de usator." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Specifica un nomine de usator e un contrasigno." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cambiar contrasigno" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Per favor corrige le errores sequente." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Specifica un nove contrasigno pro le usator %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Contrasigno" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Contrasigno (repete)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Scribe le mesme contrasigno que antea, pro verification." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Benvenite," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentation" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cambiar contrasigno" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Clauder session" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administration del sito Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administration de Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Adder" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Vider in sito" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Per favor corrige le errores sequente." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Adder %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtro" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Remover del ordination" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritate de ordination: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Alternar le ordination" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Deler" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -485,7 +498,7 @@ "objectos associate, me tu conto non ha le permission de deler objectos del " "sequente typos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -494,7 +507,7 @@ "Deler le %(object_name)s '%(escaped_object)s' necessitarea le deletion del " "sequente objectos associate protegite:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -503,16 +516,16 @@ "Es tu secur de voler deler le %(object_name)s \"%(escaped_object)s\"? Tote " "le sequente objectos associate essera delite:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Si, io es secur" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Deler plure objectos" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -523,7 +536,7 @@ "associate, ma tu conto non ha le permission de deler objectos del sequente " "typos:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -532,7 +545,7 @@ "Deler le %(objects_name)s seligite necessitarea le deletion del sequente " "objectos associate protegite:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -541,41 +554,56 @@ "Es tu secur de voler deler le %(objects_name)s seligite? Tote le sequente " "objectos e le objectos associate a illo essera delite:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Remover" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Adder un altere %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Deler?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Per %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Cambiar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Tu non ha le permission de modificar alcun cosa." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Actiones recente" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mi actiones" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nihil disponibile" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contento incognite" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -585,27 +613,27 @@ "tabellas correcte ha essite create, e que le base de datos es legibile pro " "le usator appropriate." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Contrasigno:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Contrasigno o nomine de usator oblidate?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usator" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Action" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -613,113 +641,61 @@ "Iste objecto non ha un historia de cambiamentos. Illo probabilemente non " "esseva addite per medio de iste sito administrative." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Monstrar toto" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Salveguardar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Cercar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultato" msgstr[1] "%(counter)s resultatos" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s in total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Salveguardar como nove" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Salveguardar e adder un altere" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Salveguardar e continuar le modification" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primo, specifica un nomine de usator e un contrasigno. Postea, tu potera " -"modificar plus optiones de usator." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Specifica un nomine de usator e un contrasigno." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Specifica un nove contrasigno pro le usator %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Contrasigno" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Contrasigno (repete)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Scribe le mesme contrasigno que antea, pro verification." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Remover" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Adder un altere %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Deler?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Gratias pro haber passate un tempore agradabile con iste sito web." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Aperir session de novo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cambio de contrasigno" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Contrasigno cambiate con successo" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Tu contrasigno ha essite cambiate." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -728,46 +704,34 @@ "specifica tu nove contrasigno duo vices pro verificar que illo es scribite " "correctemente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Ancian contrasigno" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nove contrasigno" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Cambiar mi contrasigno" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Reinitialisar contrasigno" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Contrasigno reinitialisate con successo" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Tu contrasigno ha essite reinitialisate. Ora tu pote aperir session." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmation de reinitialisation de contrasigno" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Specifica nove contrasigno" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -775,19 +739,15 @@ "Per favor scribe le nove contrasigno duo vices pro verificar que illo es " "scribite correctemente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nove contrasigno:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirma contrasigno:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Reinitialisation de contrasigno fallite" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -796,75 +756,94 @@ "perque illo ha jam essite usate. Per favor submitte un nove demanda de " "reinitialisation del contrasigno." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Contrasigno reinitialisate con successo" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Per favor va al sequente pagina pro eliger un nove contrasigno:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Tu nomine de usator, in caso que tu lo ha oblidate:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Gratias pro usar nostre sito!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Le equipa de %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Reinitialisar mi contrasigno" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Tote le datas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nulle)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Selige %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Selige %s a modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Recerca" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Adder un altere" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/id/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,13 +3,14 @@ # Translators: # Jannis Leidel , 2011 # rodin , 2011-2012 +# rodin , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-21 00:04+0000\n" +"Last-Translator: rodin \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/django/" "language/id/)\n" "MIME-Version: 1.0\n" @@ -18,12 +19,12 @@ "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s yang tersedia" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +34,38 @@ "dengan memilihnya pada kotak di bawah, lalu mengeklik tanda panah \"Pilih\" " "di antara kedua kotak." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Ketik pada kotak ini untuk menyaring daftar %s yang tersedia." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Pilih semua" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Pilih untuk memilih seluruh %s sekaligus." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Pilih" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Hapus" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s terpilih" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,21 +75,23 @@ "dengan memilihnya pada kotak di bawah, lalu mengeklik tanda panah \"Hapus\" " "di antara kedua kotak." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Hapus semua" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klik untuk menghapus semua pilihan %s sekaligus." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s dari %(cnt)s terpilih" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +99,8 @@ "Beberapa perubahan bidang yang Anda lakukan belum tersimpan. Perubahan yang " "telah dilakukan akan hilang." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +110,8 @@ "yang ada. Klik OK untuk menyimpan perubahan ini. Anda akan perlu mengulangi " "aksi tersebut kembali." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -115,70 +120,84 @@ "Anda telah memilih sebuah aksi, tetapi belum mengubah bidang apapun. " "Kemungkinan Anda mencari tombol Buka dan bukan tombol Simpan." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januari Februari Maret April Mei Juni Juli Agustus September Oktober " -"November Desember" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "M S S R K J S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Bentangkan" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Catatan: Waktu Anda lebih cepat %s jam dibandingkan waktu server." -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ciutkan" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Catatan: Waktu Anda lebih lambat %s jam dibandingkan waktu server." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Sekarang" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Jam" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Pilih waktu" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Tengah malam" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 pagi" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Siang" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Batal" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hari ini" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Kemarin" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Besok" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januari Februari Maret April Mei Juni Juli Agustus September Oktober " +"November Desember" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "M S S R K J S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Bentangkan" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ciutkan" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/id/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/id/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/id/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/id/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/id/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/id/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,15 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Claude Paroz , 2014 # Jannis Leidel , 2011 # rodin , 2011-2013 +# 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 16:20+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Indonesian (http://www.transifex.com/projects/p/django/" "language/id/)\n" "MIME-Version: 1.0\n" @@ -18,156 +20,161 @@ "Language: id\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Sukes menghapus %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Tidak dapat menghapus %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Yakin?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Hapus %(verbose_name_plural)s yang dipilih" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administrasi" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Semua" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ya" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Tidak" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Tidak diketahui" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Kapanpun" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hari ini" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Tujuh hari terakhir" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Bulan ini" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Tahun ini" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"Masukkan nama pengguna %(username)s dan sandi yang benar untuk akun staf. " +"Huruf besar/kecil pada bidang ini berpengaruh." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Anda harus mengulangi proses masuk karena sesi Anda telah habis." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Aksi:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "waktu aksi" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id objek" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "representasi objek" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "jenis aksi" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ganti pesan" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entri pencatatan" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entri pencatatan" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" ditambahkan." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" diubah - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" dihapus." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objek LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "None" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s diubah" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "dan" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ditambahkan." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s untuk %(name)s \"%(object)s\" diubah." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" dihapus." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Tidak ada bidang yang berubah." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -175,185 +182,181 @@ "%(name)s \"%(obj)s\" berhasil ditambahkan. Anda dapat mengeditnya lagi di " "bawah ini." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" +"%(name)s \"%(obj)s\" berhasil ditambahkan. Anda dapat menambahkan %(name)s " +"yang lain di bawah ini." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" berhasil ditambahkan." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" +"%(name)s \"%(obj)s\" berhasil diubah. Anda dapat mengeditnya lagi di bawah " +"ini." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" +"%(name)s \"%(obj)s\" berhasil diubah. Anda dapat menambahkan %(name)s yang " +"lain di bawah ini." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" berhasil diubah." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Objek harus dipilih sebelum dimanipulasi. Tidak ada objek yang berubah." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Tidak ada aksi yang dipilih." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Tambahkan %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" berhasil dihapus." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objek %(name)s dengan kunci utama %(key)r tidak ada." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Tambahkan %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Ubah %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Galat basis data" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s berhasil diubah." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s dipilih" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 dari %(cnt)s dipilih" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" berhasil dihapus." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ubah riwayat: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Menghapus %(class_name)s %(instance)s memerlukan penghapusanobjek " +"terlindungi yang terkait sebagai berikut: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Masuk" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Admin situs Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administrasi Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administrasi situs" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administrasi %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Tanggal:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Waktu:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Cari" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Tambah Lagi" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Masuk" -#: widgets.py:303 -msgid "Change:" -msgstr "" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Administrasi %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Laman tidak ditemukan" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Maaf, laman yang Anda minta tidak ditemukan." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Beranda" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Galat server" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Galat server (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Galat Server (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -361,120 +364,141 @@ "Galat terjadi dan telah dilaporkan ke administrator situs lewat email untuk " "diperbaiki. Terima kasih atas pengertiannya." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Jalankan aksi terpilih" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Buka" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klik di sini untuk memilih semua objek pada semua laman" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Pilih seluruh %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Bersihkan pilihan" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Pertama-tama, masukkan nama pengguna dan sandi. Anda akan dapat mengubah " +"opsi pengguna lain setelah itu." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Masukkan nama pengguna dan sandi." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Ganti sandi" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Perbaiki galat di bawah ini." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Perbaiki galat di bawah ini." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Masukkan sandi baru untuk pengguna %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Sandi" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Sandi (ulangi)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Masukkan sandi yang sama dengan di atas, untuk verifikasi." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Selamat datang," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentasi" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Ganti sandi" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Keluar" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Admin situs Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrasi Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Tambah" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Riwayat" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Lihat di situs" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Perbaiki galat di bawah ini." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Tambahkan %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Dihapus dari pengurutan" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritas pengurutan: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Ubah pengurutan" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Hapus" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -485,7 +509,7 @@ "yang terkait, tetapi akun Anda tidak memiliki izin untuk menghapus objek " "dengan tipe berikut:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -494,7 +518,7 @@ "Menghapus %(object_name)s '%(escaped_object)s' memerlukan penghapusan objek " "terlindungi yang terkait sebagai berikut:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -503,16 +527,16 @@ "Yakin ingin menghapus %(object_name)s \"%(escaped_object)s\"? Semua objek " "lain yang terkait juga akan dihapus:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ya, tentu saja" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Hapus beberapa objek sekaligus" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -523,7 +547,7 @@ "tetapi akun Anda tidak memiliki izin untuk menghapus objek dengan tipe " "berikut:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -532,7 +556,7 @@ "Menghapus %(objects_name)s terpilih memerlukan penghapusan objek terlindungi " "yang terkait sebagai berikut:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -541,41 +565,56 @@ "Yakin akan menghapus %(objects_name)s terpilih? Semua objek berikut beserta " "objek terkait juga akan dihapus:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Hapus" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Tambahkan %(verbose_name)s lagi" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Hapus?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Berdasarkan %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Model pada aplikasi %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Ubah" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Anda tidak memiliki izin untuk mengubah apapun." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Aktivitas Terbaru" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Aktivitas Saya" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Tidak ada yang tersedia" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Konten tidak diketahui" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -584,27 +623,27 @@ "Ada masalah dengan instalasi basis data Anda. Pastikan tabel yang sesuai " "pada basis data telah dibuat dan dapat dibaca oleh pengguna yang benar." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Sandi:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Lupa nama pengguna atau sandi?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Tanggal/waktu" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Pengguna" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Aksi" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -612,111 +651,60 @@ "Objek ini tidak memiliki riwayat perubahan. Kemungkinan objek ini tidak " "ditambahkan melalui situs administrasi ini." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Tampilkan semua" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Simpan" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Cari" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s buah" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Simpan sebagai baru" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Simpan dan tambahkan lagi" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Simpan dan terus mengedit" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Pertama-tama, masukkan nama pengguna dan sandi. Anda akan dapat mengubah " -"opsi pengguna lain setelah itu." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Masukkan nama pengguna dan sandi." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Masukkan sandi baru untuk pengguna %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Sandi" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Sandi (ulangi)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Masukkan sandi yang sama dengan di atas, untuk verifikasi." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Hapus" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Tambahkan %(verbose_name)s lagi" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Hapus?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Terima kasih telah menggunakan situs ini hari ini." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Masuk kembali" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Ubah sandi" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Sandi berhasil diubah" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Sandi Anda telah diubah." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -724,46 +712,34 @@ "Dengan alasan keamanan, masukkan sandi lama Anda dua kali untuk memastikan " "Anda tidak salah mengetikkannya." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Sandi lama" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Sandi baru" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Ubah sandi saya" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Setel ulang sandi" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Sandi telah disetel ulang" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Sandi Anda telah diperbarui. Silakan masuk." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Konfirmasi penyetelan ulang sandi" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Masukkan sandi baru" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -771,19 +747,15 @@ "Masukkan sandi baru dua kali untuk memastikan Anda tidak salah " "mengetikkannya." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Sandi baru:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Konfirmasi sandi:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Penyetelan ulang sandi gagal" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -792,24 +764,23 @@ "tersebut telah dipakai sebelumnya. Ajukan permintaan penyetelan sandi sekali " "lagi." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Penyetelan ulang sandi berhasil" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"Kami telah mengirim email berisi petunjuk untuk mengatur ulang sandi Anda. " +"Anda akan menerimanya dalam beberapa saat." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Jika Anda tidak menerima email, pastikan Anda telah memasukkan alamat yang " +"digunakan saat pendaftaran serta periksa folder spam Anda." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -818,24 +789,24 @@ "Anda menerima email ini karena Anda meminta penyetelan ulang sandi untuk " "akun pengguna di %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Kunjungi laman di bawah ini dan ketikkan sandi baru:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Nama pengguna Anda, jika lupa:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Terima kasih telah menggunakan situs kami!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Tim %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -843,28 +814,52 @@ "Lupa sandinya? Masukkan alamat email Anda di bawah ini agar kami dapat " "mengirimkan petunjuk untuk menyetel ulang sandinya." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Alamat email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Setel ulang sandi saya" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Semua tanggal" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Tidak ada)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Pilih %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Pilih %s untuk diubah" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Tanggal:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Waktu:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Cari" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Tambah Lagi" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Saat ini:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ubah:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/io/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/io/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/io/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/io/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/io/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/io/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,188 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/io/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/io/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/io/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/io/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/io/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/io/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,862 @@ +# 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-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+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" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "%(count)d %(items)s eliminesis sucesoze." + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "Onu ne povas eliminar %(name)s" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "Ka vu esas certa?" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "Eliminar selektita %(verbose_name_plural)s" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "Omni" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "Yes" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "No" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "Nekonocato" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "Irga dato" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "Hodie" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "7 antea dii" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "Ca monato" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "Ca yaro" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" +"Skribez la korekta %(username)s e pasvorto di kelka staff account. Remarkez " +"ke both feldi darfas rikonocar miniskulo e mayuskulo." + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "Ago:" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "horo dil ago" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "id dil objekto" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "repr dil objekto" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "flago dil ago" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "chanjar mesajo" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "logo informo" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "logo informi" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "\"%(object)s\" agregesis." + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "\"%(object)s\" chanjesis - %(changes)s" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "\"%(object)s\" eliminesis." + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "LogEntry Objekto" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "Nula" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "%s chanjesis." + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "e" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" agregesis." + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "%(list)s chanjesis por la %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" eliminesis." + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "Nula feldo chanjesis." + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" +"La %(name)s \"%(obj)s\" agregesis sucesoze. Vu povas modifikar ol altrafoye " +"infre." + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" +"La %(name)s \"%(obj)s\" agregesis sucesoze. Vu povas agregar altra %(name)s " +"infre." + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "La %(name)s \"%(obj)s\" agregesis sucesoze." + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "" +"La %(name)s \"%(obj)s\" chanjesis sucesoze. Vu povas modifikar ol altrafoye " +"infre." + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" +"La %(name)s \"%(obj)s\" chanjesis sucesoze. Vu povas agregar altra %(name)s " +"infre." + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "La %(name)s \"%(obj)s\" chanjesis sucesoze." + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" +"Onu devas selektar la objekti por aplikar oli irga ago. Nula objekto " +"chanjesis." + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "Nula ago selektesis." + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "La %(name)s \"%(obj)s\" eliminesis sucesoze." + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "La %(name)s objekto kun precipua klefo %(key)r ne existas." + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Agregar %s" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "Chanjar %s" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "Eroro del datumaro" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "%(count)s %(name)s chanjesis sucesoze." +msgstr[1] "%(count)s %(name)s chanjesis sucesoze." + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "%(total_count)s selektita" +msgstr[1] "La %(total_count)s selektita" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "Selektita 0 di %(cnt)s" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "Modifikuro historio: %s" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "%(class_name)s %(instance)s" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" +"Por eliminar %(class_name)s %(instance)s on mustas eliminar la sequanta " +"protektita objekti relatita: %(related_objects)s" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django situo admin" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administreyo" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "Administrayo dil ret-situo" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Startar sesiono" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "La pagino ne renkontresis" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "Pardonez, ma la demandita pagino ne renkontresis." + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "Hemo" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "Eroro del servilo" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "Eroro del servilo (500)" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "Eroro del servilo (500)" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" +"Eroro eventis. Ico informesis per e-posto a la administranti dil ret-situo e " +"la eroro esos korektigata balde. Danko pro vua pacienteso." + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "Exekutar la selektita ago" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "Irar" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "Kliktez hike por selektar la objekti di omna pagini" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "Selektar omna %(total_count)s %(module_name)s" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "Desfacar selekto" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Unesme, skribez uzer-nomo ed pasvorto. Pos, vu povos modifikar altra uzer-" +"selekto." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Skribez uzer-nomo ed pasvorto." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Chanjar pasvorto" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Korektigez la eroro infre." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Korektigez la erori infre." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "Skribez nova pasvorto por la uzero %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Pasvorto" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Pasvorto (altra foyo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Skribez la sama pasvorto por verifikar." + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "Bonvenez," + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "Dokumento" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "Klozar sesiono" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "Agregar" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "Historio" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "Vidar en la ret-situo" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "Agregar %(name)s" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "Filtrar" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "Eskartar de klasifiko" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "Precedo dil klasifiko: %(priority_number)s" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "Aktivar/desaktivar klasifiko" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"Eliminar la %(object_name)s '%(escaped_object)s' eliminos relatita objekti, " +"ma vua account ne havas permiso por eliminar la sequanta objekti:" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"Eliminar la %(object_name)s '%(escaped_object)s' eliminus la sequanta " +"protektita objekti relatita:" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"Ka vu volas eliminar la %(object_name)s \"%(escaped_object)s\"? Omna " +"sequanta objekti relatita eliminesos:" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "Yes, me esas certa" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "Eliminar multopla objekti" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"Eliminar la selektita %(objects_name)s eliminos relatita objekti, ma vua " +"account ne havas permiso por eliminar la sequanta objekti:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" +"Eliminar la selektita %(objects_name)s eliminos la sequanta protektita " +"objekti relatita:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" +"Ka vu volas eliminar la selektita %(objects_name)s? Omna sequanta objekti ed " +"olia relatita objekti eliminesos:" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Eliminar" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Agregar altra %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Ka eliminar?" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "Per %(filter_title)s " + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "Modeli en la %(name)s apliko" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "Modifikar" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "Vu ne havas permiso por facar modifiki." + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "Recenta agi" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "Mea agi" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "Nulo disponebla" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "Nekonocata kontenajo" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"Vua datumaro instaluro esas defektiva. Verifikez ke la datumaro tabeli " +"kreadesis e ke la uzero havas permiso por lektar la datumaro." + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "Pasvorto:" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "Ka vu obliviis vua pasvorto od uzer-nomo?" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "Dato/horo" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "Uzero" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "Ago" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" +"Ica objekto ne havas chanjo-historio. Olu forsan ne agregesis per ica " +"administrala ret-situo." + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "Montrar omni" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "Salvar" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "Serchar" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "%(counter)s resulto" +msgstr[1] "%(counter)s resulti" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "%(full_result_count)s totala" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "Salvar kom nova" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "Salvar ed agregar altra" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "Salvar e durar la modifiko" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "Danko pro vua spensita tempo en la ret-situo hodie." + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "Ristartar sesiono" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "Pasvorto chanjo" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "Vua pasvorto chanjesis." + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"Por kauciono, skribez vua anta pasvorto e pos skribez vua nova pasvorto " +"dufoye por verifikar ke olu skribesis korekte." + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "Antea pasvorto" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "Nova pasvorto" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "Modifikar mea pasvorto" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "Pasvorto chanjo" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "Vua pasvorto chanjesis. Vu darfas startar sesiono nun." + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "Pasvorto chanjo konfirmo" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" +"Skribez vua nova pasvorto dufoye por verifikar ke olu skribesis korekte." + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "Nova pasvorto:" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "Konfirmez pasvorto:" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" +"La link por chanjar pasvorto ne esis valida, forsan pro ke olu ja uzesis. " +"Demandez nova pasvorto chanjo." + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" +"Ni sendis e-posto mesajo a vu kun instrucioni por chanjar vua pasvorto. Olu " +"devus arivar balde." + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" +"Se vu ne recevas mesajo, verifikez ke vu skribis la sama e-posto adreso " +"uzita por vua registro e lektez vua spam mesaji." + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" +"Vu esas recevanta ica mesajo pro ke vu demandis pasvorto chanjo por vua " +"uzero account che %(site_name)s." + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "Irez al sequanta pagino e selektez nova pasvorto:" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "Vua uzernomo, se vu obliviis olu:" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "Danko pro uzar nia ret-situo!" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "La equipo di %(site_name)s" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" +"Ka vu obliviis vua pasvorto? Skribez vua e-posto adreso infre e ni sendos " +"instrucioni por kreadar nova pasvorto." + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "E-postala adreso:" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "Chanjar mea pasvorto" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "Omna dati" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "(Nula)" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "Selektar %s" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "Selektar %s por chanjar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dato:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Horo:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Serchado" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Agregar altro" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Aktuale" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Chanjo:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/is/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -6,11 +6,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+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" @@ -19,12 +19,12 @@ "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Fáanleg %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "Þetta er listi af því %s sem er í boði. Þú getur ákveðið hluti með því að " "velja þá í boxinu að neðan og ýta svo á \"Velja\" örina milli boxana tveggja." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Skrifaðu í boxið til að sía listann af því %s sem er í boði." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Sía" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Velja öll" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Smelltu til að velja allt %s í einu." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Veldu" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Fjarlægja" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Valin %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "Þetta er listinn af völdu %s. Þú getur fjarlægt hluti með því að velja þá í " "boxinu að neðan og ýta svo á \"Eyða\" örina á milli boxana tveggja." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Eyða öllum" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Smelltu til að fjarlægja allt valið %s í einu." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] " %(sel)s í %(cnt)s valin" msgstr[1] " %(sel)s í %(cnt)s valin" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "Enn eru óvistaðar breytingar í reitum. Ef þú keyrir aðgerð munu breytingar " "ekki verða vistaðar." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "Þú hefur valið aðgerð en hefur ekki vistað breytingar á reitum. Vinsamlegast " "veldu 'Í lagi' til að vista. Þú þarft að endurkeyra aðgerðina." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +118,86 @@ "Þú hefur valið aðgerð en hefur ekki gert breytingar á reitum. Þú ert líklega " "að leita að 'Fara' hnappnum frekar en 'Vista' hnappnum." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"janúar febrúar mars apríl maí júní júlí ágúst september október nóvember " -"desember" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M Þ M F F L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Sýna" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Fela" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Núna" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Klukka" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Veldu tíma" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Miðnætti" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 f.h." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Hádegi" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Hætta við" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Í dag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Dagatal" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Í gær" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Á morgun" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"janúar febrúar mars apríl maí júní júlí ágúst september október nóvember " +"desember" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M Þ M F F L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Sýna" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Fela" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/is/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/is/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/is/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/is/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/is/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/is/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,14 @@ # Translators: # Hafsteinn Einarsson , 2011-2012 # Jannis Leidel , 2011 -# einherji , 2013 +# Kári Tristan Helgason , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 17:01+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Icelandic (http://www.transifex.com/projects/p/django/" "language/is/)\n" "MIME-Version: 1.0\n" @@ -19,62 +19,68 @@ "Language: is\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Eyddi %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Get ekki eytt %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ertu viss?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Eyða völdum %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Allt" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Já" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nei" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Óþekkt" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Allar dagsetningar" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Dagurinn í dag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Síðustu 7 dagar" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Þessi mánuður" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Þetta ár" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,113 +89,110 @@ "Vinsamlegast sláðu inn rétt %(username)s og lykilorð fyrir starfsmanna " "aðgang. Takið eftir að í báðum reitum skipta há- og lágstafir máli." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Vinsamlegast skráðu þig inn aftur vegna þess að setan þín rann út. " - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Aðgerð:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "tími aðgerðar" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "kenni hlutar" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "framsetning hlutar" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "aðgerðarveifa" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "breyta skilaboði" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "kladdafærsla" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "kladdafærslur" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" bætt við." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Breytti \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Eyddi \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry hlutur" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ekkert" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Breytti %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "og" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Bætti við %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Breytti %(list)s fyrir %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Eyddi %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Engum reitum breytt." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s „%(obj)s“ hefur verið bætt við. Þú getur breytt því aftur að neðan." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s „%(obj)s“ var bætt við." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -197,7 +200,7 @@ msgstr "" "%(name)s \"%(obj)s\" hefur verið breytt. Þú getur breytt því aftur að neðan." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -206,12 +209,12 @@ "%(name)s \"%(obj)s\" hefur verið breytt. Þú getur bætt við öðru %(name)s að " "neðan." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s „%(obj)s“ hefur verið breytt." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -219,270 +222,277 @@ "Hlutir verða að vera valdir til að framkvæma aðgerðir á þeim. Engu hefur " "verið breytt." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Engin aðgerð valin." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Bæta við %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s „%(obj)s“ var eytt." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s hlutur með lykilinn %(key)r er ekki til." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Bæta við %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Breyta %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Gagnagrunnsvilla" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s var breytt." msgstr[1] "%(count)s %(name)s var breytt." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Allir %(total_count)s valdir" msgstr[1] "Allir %(total_count)s valdir" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 af %(cnt)s valin" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s „%(obj)s“ var eytt." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Breytingarsaga: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Til að eyða %(object_name)s ' %(escaped_object)s ' þyrfti að eyða " -"eftirfarandi tengdum hlutum:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Skrá inn" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django vefstjóri" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django vefstjórn" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Vefstjóri" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s vefstjórn" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dagsetning:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tími:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Fletta upp" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Bæta við öðru" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Skrá inn" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Síða fannst ekki" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Því miður fannst umbeðin síða ekki." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Heim" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Kerfisvilla" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Kerfisvilla (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Kerfisvilla (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Keyra valda aðgerð" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Áfram" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Smelltu hér til að velja alla hluti" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Velja alla %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Hreinsa val" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Fyrst, settu inn notendanafn og lykilorð. Svo geturðu breytt öðrum " +"notendamöguleikum." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Sláðu inn notandanafn og lykilorð." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Breyta lykilorði" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Vinsamlegast leiðréttu villurnar hér að neðan:" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Settu inn nýtt lykilorð fyrir notandann %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Lykilorð" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Lykilorð (aftur)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Settu inn sama lykilorðið aftur til staðfestingar." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Velkomin(n)," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Skjölun" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Breyta lykilorði" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Skrá út" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django vefstjóri" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django vefstjórn" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Bæta við" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Saga" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Skoða á vef" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Vinsamlegast leiðréttu villurnar hér að neðan:" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Bæta við %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Sía" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Taka úr röðun" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Forgangur röðunar: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Röðun af/á" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Eyða" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -492,7 +502,7 @@ "Eyðing á %(object_name)s „%(escaped_object)s“ hefði í för með sér eyðingu á " "tengdum hlutum en þú hefur ekki réttindi til að eyða eftirfarandi hlutum:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -501,7 +511,7 @@ "Að eyða %(object_name)s ' %(escaped_object)s ' þyrfti að eyða eftirfarandi " "tengdum hlutum:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -510,16 +520,16 @@ "Ertu viss um að þú viljir eyða %(object_name)s „%(escaped_object)s“? Öllu " "eftirfarandi verður eytt:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Já ég er viss." -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Eyða mörgum hlutum." -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -529,7 +539,7 @@ "Að eyða völdu %(objects_name)s leiðir til þess að skyldum hlutum er eytt, en " "þinn aðgangur hefur ekki réttindi til að eyða eftirtöldum hlutum:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -538,7 +548,7 @@ "Að eyða völdum %(objects_name)s myndi leiða til þess að eftirtöldum skyldum " "hlutum yrði eytt:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -547,41 +557,56 @@ "Ertu viss um að þú viljir eyða völdum %(objects_name)s? Öllum eftirtöldum " "hlutum og skyldum hlutum verður eytt:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Fjarlægja" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Bæta við öðrum %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Eyða?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Eftir %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Breyta" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Þú hefur ekki réttindi til að breyta neinu" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Nýlegar aðgerðir" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mínar aðgerðir" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Engin fáanleg" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Óþekkt innihald" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -590,27 +615,27 @@ "Eitthvað er að gagnagrunnsuppsetningu. Gakktu úr skuggum um að allar töflur " "séu til staðar og að notandinn hafi aðgang að grunninum." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Lykilorð:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Gleymt notandanafn eða lykilorð?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dagsetning/tími" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Notandi" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Aðgerð" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -618,112 +643,61 @@ "Þessi hlutur hefur enga breytingasögu. Hann var líklega ekki búinn til á " "þessu stjórnunarsvæði." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Sýna allt" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Vista" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Leita" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s niðurstaða" msgstr[1] "%(counter)s niðurstöður" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s í heildina" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Vista sem nýtt" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Vista og búa til nýtt" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Vista og halda áfram að breyta" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Fyrst, settu inn notendanafn og lykilorð. Svo geturðu breytt öðrum " -"notendamöguleikum." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Sláðu inn notandanafn og lykilorð." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Settu inn nýtt lykilorð fyrir notandann %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Lykilorð" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Lykilorð (aftur)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Settu inn sama lykilorðið aftur til staðfestingar." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Fjarlægja" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Bæta við öðrum %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Eyða?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Takk fyrir að verja tíma í vefsíðuna í dag." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Skráðu þig inn aftur" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Breyta lykilorði" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Breyting á lykilorði tókst" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Lykilorði þínu var breytt" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -732,46 +706,34 @@ "lykilorðið tvisvar inn svo að hægt sé að ganga úr skugga um að þú hafir ekki " "gert innsláttarvillu." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Gamalt lykilorð" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nýtt lykilorð" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Breyta lykilorðinu mínu" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Endurstilla lykilorð" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Endurstilling lykilorðs tókst" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Lykilorðið var endurstillt. Þú getur núna skráð þig inn á vefsvæðið." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Staðfesting endurstillingar lykilorðs" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Settu inn nýtt lykilorð" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -779,19 +741,15 @@ "Vinsamlegast settu inn nýja lykilorðið tvisvar til að forðast " "innsláttarvillur." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nýtt lykilorð:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Staðfestu lykilorð:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Endurstilling á lykilorði mistókst" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -799,75 +757,94 @@ "Endurstilling lykilorðs tókst ekki. Slóðin var ógild. Hugsanlega hefur hún " "nú þegar verið notuð. Vinsamlegast biddu um nýja endurstillingu." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Endurstilling á lykilorði tókst" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Vinsamlegast farðu á eftirfarandi síðu og veldu nýtt lykilorð:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Notandanafnið þitt ef þú skyldir hafa gleymt því:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Takk fyrir að nota vefinn okkar!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s hópurinn" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Endursstilla lykilorðið mitt" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Allar dagsetningar" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ekkert)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Veldu %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Veldu %s til að breyta" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dagsetning:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tími:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Fletta upp" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Bæta við öðru" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/it/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,15 @@ # Translators: # Denis Darii , 2011 # Jannis Leidel , 2011 +# Marco Bonetti, 2014 # Nicola Larosa , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-27 16:27+0000\n" +"Last-Translator: Marco Bonetti\n" "Language-Team: Italian (http://www.transifex.com/projects/p/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -19,12 +20,12 @@ "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s disponibili" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +35,38 @@ "nella casella qui sotto e poi facendo clic sulla freccia \"Scegli\" tra le " "due caselle." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Scrivi in questa casella per filtrare l'elenco dei %s disponibili." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Scegli tutto" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Fai clic per scegliere tutti i %s in una volta." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Scegli" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Elimina" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s scelti" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,22 +76,24 @@ "casella qui sotto e poi facendo clic sulla freccia \"Elimina\" tra le due " "caselle." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Elimina tutti" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Fai clic per eliminare tutti i %s in una volta." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s di %(cnt)s selezionato" msgstr[1] "%(sel)s di %(cnt)s selezionati" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +101,8 @@ "Hai delle modifiche in campi singoli. Se esegui un'azione, le modifiche non " "salvate andranno perse." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -107,7 +111,8 @@ "Hai selezionato un'azione, ma non hai ancora salvato le modifiche apportate " "a campi singoli. Fai clic su OK per salvare. Poi dovrai ri-eseguire l'azione." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,70 +121,86 @@ "Hai selezionato un'azione, e non hai ancora apportato alcuna modifica a " "campi singoli. Probabilmente stai cercando il pulsante Go, invece di Save." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"gennaio febbraio marzo aprile maggio giugno luglio agosto settembre ottobre " -"novembre dicembre" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M G V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostra" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Nascondi" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Nota: Sei %s ora in anticipo rispetto al server." +msgstr[1] "Nota: Sei %s ore in anticipo rispetto al server." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Nota: Sei %s ora in ritardo rispetto al server." +msgstr[1] "Nota: Sei %s ore in ritardo rispetto al server." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Adesso" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Orologio" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Scegli un orario" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Mezzanotte" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 del mattino" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mezzogiorno" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Annulla" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Oggi" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendario" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ieri" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Domani" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"gennaio febbraio marzo aprile maggio giugno luglio agosto settembre ottobre " +"novembre dicembre" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M G V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostra" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Nascondi" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/it/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/it/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/it/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/it/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/it/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/it/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,14 +4,15 @@ # Denis Darii , 2011 # Flavio Curella , 2013 # Jannis Leidel , 2011 +# Marco Bonetti, 2014 # Nicola Larosa , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 11:44+0000\n" -"Last-Translator: Nicola Larosa \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-27 09:17+0000\n" +"Last-Translator: palmux \n" "Language-Team: Italian (http://www.transifex.com/projects/p/django/language/" "it/)\n" "MIME-Version: 1.0\n" @@ -20,62 +21,68 @@ "Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Cancellati/e con successo %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Impossibile cancellare %(name)s " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Sei sicuro?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Cancella %(verbose_name_plural)s selezionati/e" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Amministrazione" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Tutti" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sì" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "No" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Sconosciuto" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Qualsiasi data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Oggi" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Ultimi 7 giorni" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Questo mese" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Quest'anno" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,94 +91,91 @@ "Inserisci %(username)s e password corretti per un account di staff. Nota che " "entrambi i campi distinguono maiuscole e minuscole." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Effettua di nuovo l'accesso, perché la tua sessione è scaduta." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Azione:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "momento dell'azione" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id dell'oggetto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "rappr. dell'oggetto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "flag di azione" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "messaggio di modifica" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "voce di log" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "voci di log" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Aggiunto \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Cambiato \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Cancellato \"%(object)s .\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Oggetto LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nessuno" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s modificato/a." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "e" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Aggiunto/a %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Cambiato %(list)s per %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Cancellato/a %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nessun campo modificato." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -179,7 +183,7 @@ "%(name)s \"%(obj)s\" aggiunto/a correttamente. Puoi modificare ancora qui " "sotto." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,12 +192,12 @@ "%(name)s \"%(obj)s\" è stato inserito correttamente. Puoi aggiungere un " "altro %(name)s qui di seguito." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" aggiunto/a correttamente." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -202,7 +206,7 @@ "%(name)s \"%(obj)s\" è stato modificato correttamente. Puoi modificarlo di " "nuovo qui di seguito." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -211,12 +215,12 @@ "%(name)s \"%(obj)s\" è stato modificato correttamente. Puoi aggiungere un " "altro %(name)s qui di seguito." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" modificato/a correttamente." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -224,66 +228,66 @@ "Occorre selezionare degli oggetti per potervi eseguire azioni. Nessun " "oggetto è stato cambiato." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nessuna azione selezionata." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Aggiungi %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "L'oggetto %(name)s con chiave primaria %(key)r non esiste." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Aggiungi %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modifica %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Errore nel database" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s modificato/a correttamente." msgstr[1] "%(count)s %(name)s modificati/e correttamente." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s selezionato/a" msgstr[1] "Tutti i %(total_count)s selezionati/e" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 di %(cnt)s selezionati/e" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" cancellato/a correttamente." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Tracciato delle modifiche: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -292,83 +296,71 @@ "La cancellazione di %(class_name)s %(instance)s richiederebbe l'eliminazione " "dei seguenti oggetti protetti correlati: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Accedi" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Ammin. sito Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Amministrazione Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Amministrazione sito" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Amministrazione %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Ora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Consultazione" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Aggiungi un Altro" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Attualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Accedi" -#: widgets.py:303 -msgid "Change:" -msgstr "Modifica:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Amministrazione %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Pagina non trovata" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Spiacenti, ma la pagina richiesta non è stata trovata." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Pagina iniziale" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Errore del server" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Errore del server (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Errore del server (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -376,120 +368,142 @@ "Si è verificato un errore. Gli amministratori del sito ne sono stati " "informati per email, e vi porranno rimedio a breve. Grazie per la pazienza." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Esegui l'azione selezionata" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Vai" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Clicca qui per selezionare gli oggetti da tutte le pagine." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Seleziona tutti/e %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Annulla la selezione" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Inserisci innanzitutto nome utente e password. Potrai poi modificare le " +"altre impostazioni dell'utente." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Inserisci il nome utente e password." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Cambia la password" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Correggi l'errore qui sotto." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Correggi gli errori qui sotto." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Inserisci una nuova password per l'utente %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Password" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Password (di nuovo)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Inserisci la stessa password inserita sopra, come verifica." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Benvenuto/a," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentazione" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Cambia la password" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Annulla l'accesso" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Ammin. sito Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Amministrazione Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Aggiungi" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Storia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Vedi sul sito" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Correggi l'errore qui sotto." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Correggi gli errori qui sotto." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Aggiungi %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtra" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Elimina dall'ordinamento" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Priorità d'ordinamento: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Abilita/disabilita ordinamento" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Cancella" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -500,7 +514,7 @@ "cancellazione di oggetti collegati, ma questo account non ha i permessi per " "cancellare gli oggetti dei seguenti tipi:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -509,7 +523,7 @@ "La cancellazione di %(object_name)s '%(escaped_object)s' richiederebbe " "l'eliminazione dei seguenti oggetti protetti correlati:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -518,16 +532,16 @@ "Sicuro di voler cancellare %(object_name)s \"%(escaped_object)s\"? Tutti i " "seguenti oggetti collegati verranno cancellati:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sì, sono sicuro" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Cancella più oggetti" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -538,7 +552,7 @@ "oggetti correlati, ma il tuo account non dispone dell'autorizzazione a " "eliminare i seguenti tipi di oggetti:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -547,7 +561,7 @@ "Cancellare %(objects_name)s selezionato/a richiederebbe l'eliminazione dei " "seguenti oggetti protetti correlati:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -556,41 +570,56 @@ "Sei sicuro di voler cancellare %(objects_name)s? Tutti i seguenti oggetti e " "le loro voci correlate verranno cancellati:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Elimina" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Aggiungi un/a altro/a %(verbose_name)s." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Cancellare?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Per %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelli nell'applicazione %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modifica" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Non hai i privilegi per modificare alcunché." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Azioni Recenti" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Azioni Proprie" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nessuna disponibile" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Contenuto sconosciuto" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -600,27 +629,27 @@ "appropriate del database siano state create, e che il database sia leggibile " "dall'utente appropriato." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Password:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Hai dimenticato la password o il nome utente?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/ora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Utente" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Azione" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -628,113 +657,61 @@ "Questo oggetto non ha cambiamenti registrati. Probabilmente non è stato " "creato con questo sito di amministrazione." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostra tutto" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Salva" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Cerca" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s risultato" msgstr[1] "%(counter)s risultati" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s in tutto" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Salva come nuovo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Salva e aggiungi un altro" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Salva e continua le modifiche" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Inserisci innanzitutto nome utente e password. Potrai poi modificare le " -"altre impostazioni dell'utente." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Inserisci il nome utente e password." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Inserisci una nuova password per l'utente %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Password" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Password (di nuovo)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Inserisci la stessa password inserita sopra, come verifica." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Elimina" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Aggiungi un/a altro/a %(verbose_name)s." - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Cancellare?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Grazie per aver speso il tuo tempo prezioso su questo sito oggi." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Accedi di nuovo" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Cambio password" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Cambio password avvenuto correttamente" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "La password è stata cambiata." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -742,46 +719,34 @@ "Inserisci la password attuale, per ragioni di sicurezza, e poi la nuova " "password due volte, per verificare di averla scritta correttamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Password attuale" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nuova password" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Modifica la mia password" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Reimposta la password" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Password reimpostata" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "La tua password è stata impostata. Ora puoi effettuare l'accesso." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Conferma reimpostazione password" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Inserisci la nuova password" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -789,19 +754,15 @@ "Inserisci la nuova password due volte, per verificare di averla scritta " "correttamente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nuova password:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Conferma la password:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Password non reimpostata" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -809,12 +770,7 @@ "Il link per la reimpostazione della password non era valido, forse perché " "era già stato usato. Richiedi una nuova reimpostazione della password." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Password reimpostata correttamente" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -822,7 +778,7 @@ "Abbiamo inviato istruzioni per impostare la password all'indirizzo email che " "hai indicato. Dovresti riceverle a breve." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -830,7 +786,7 @@ "Se non ricevi un messaggio email, accertati di aver inserito l'indirizzo con " "cui ti sei registrato, e controlla la cartella dello spam." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -839,24 +795,24 @@ "Ricevi questa mail perché hai richiesto di reimpostare la password del tuo " "account utente presso %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Vai alla pagina seguente e scegli una nuova password:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Il tuo nome utente, in caso tu l'abbia dimenticato:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Grazie per aver usato il nostro sito!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Il team di %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -864,28 +820,52 @@ "Password dimenticata? Inserisci il tuo indirizzo email qui sotto, e ti " "invieremo istruzioni per impostarne una nuova." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Indirizzo email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Reimposta la mia password" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Tutte le date" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nessuno)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Scegli %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Scegli %s da modificare" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Ora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Consultazione" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Aggiungi un Altro" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Attualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Modifica:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ja/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# Shinya Okano , 2012 +# Shinya Okano , 2012,2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-28 10:18+0000\n" +"Last-Translator: Shinya Okano \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/" "ja/)\n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "利用可能 %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "これが使用可能な %s のリストです。下のボックスで項目を選択し、2つのボックス間" "の \"選択\"の矢印をクリックして、いくつかを選択することができます。" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "使用可能な %s のリストを絞り込むには、このボックスに入力します。" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "フィルター" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "全て選択" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "クリックするとすべての %s を選択します。" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "選択" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "削除" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "選択された %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,21 +72,23 @@ "これが選択された %s のリストです。下のボックスで選択し、2つのボックス間の " "\"削除\"矢印をクリックして一部を削除することができます。" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "すべて削除" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "クリックするとすべての %s を選択から削除します。" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s個中%(sel)s個選択" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -94,7 +96,8 @@ "フィールドに未保存の変更があります。操作を実行すると未保存の変更は失われま" "す。" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -103,7 +106,8 @@ "操作を選択しましたが、フィールドに未保存の変更があります。OKをクリックして保" "存してください。その後、操作を再度実行する必要があります。" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -112,68 +116,82 @@ "操作を選択しましたが、フィールドに変更はありませんでした。もしかして保存ボタ" "ンではなくて実行ボタンをお探しですか。" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "1月 2月 3月 4月 5月 6月 7月 8月 9月 10月 11月 12月" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "日 月 火 水 木 金 土" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "表示" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "ノート: あなたの環境はサーバー時間より、%s時間進んでいます。" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "非表示" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "ノート: あなたの環境はサーバー時間より、%s時間遅れています。" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "現在" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "時計" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "時間を選択" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "0時" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "午前 6 時" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "12時" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "キャンセル" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "今日" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "カレンダー" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "昨日" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "明日" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "1月 2月 3月 4月 5月 6月 7月 8月 9月 10月 11月 12月" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "日 月 火 水 木 金 土" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "表示" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "非表示" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ja/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ja/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ja/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ja/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ja/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,14 @@ # # 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-05 06:38+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-15 00:27+0000\n" "Last-Translator: Shinya Okano \n" "Language-Team: Japanese (http://www.transifex.com/projects/p/django/language/" "ja/)\n" @@ -19,62 +19,68 @@ "Language: ja\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d 個の %(items)s を削除しました。" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s が削除できません" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "よろしいですか？" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "選択された %(verbose_name_plural)s の削除" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "管理" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "全て" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "はい" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "いいえ" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "不明" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "いつでも" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "今日" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "過去 7 日間" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "今月" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "今年" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,101 +89,97 @@ "スタッフアカウントの正しい%(username)sとパスワードを入力してください。どちら" "のフィールドも大文字と小文字は区別されます。" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" -"再ログインしてください。ログインセッションが有効期間切れしてしまいました。" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "操作:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "操作時刻" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "オブジェクト ID" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "オブジェクトの文字列表現" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "操作種別" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "変更メッセージ" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ログエントリー" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "ログエントリー" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" を追加しました。" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" を変更しました - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\"を削除しました。" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "ログエントリー オブジェクト" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "None" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s を変更しました。" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "と" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\"を追加しました。" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" の %(list)s を変更しました。" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" を削除しました。" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "変更はありませんでした。" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" を追加しました。続けて編集できます。" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -185,19 +187,19 @@ msgstr "" "%(name)s \"%(obj)s\" を追加しました。 別の %(name)s を以下から追加できます。" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" を追加しました。" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "%(name)s \"%(obj)s\" を変更しました。 以下から再度編集できます。" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -205,161 +207,149 @@ msgstr "" "%(name)s \"%(obj)s\" を変更しました。 別の %(name)s を以下から追加できます。" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" を変更しました。" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "操作を実行するには、対象を選択する必要があります。何も変更されませんでした。" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "操作が選択されていません。" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s を追加" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" を削除しました。" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "主キーが %(key)r である %(name)s オブジェクトは存在しません。" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s を追加" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s を変更" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "データベースエラー" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s 個の %(name)s を変更しました。" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s 個選択されました" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s個の内ひとつも選択されていません" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" を削除しました。" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "変更履歴: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"%(object_name)s '%(escaped_object)s' を削除するためには、次の保護された関連オ" -"ブジェクトの削除が必要です:" +"%(class_name)s %(instance)s を削除するには以下の保護された関連オブジェクトを" +"削除することになります: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ログイン" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django サイト管理" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django 管理サイト" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "サイト管理" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s サイト管理" - -#: widgets.py:90 -msgid "Date:" -msgstr "日付:" - -#: widgets.py:91 -msgid "Time:" -msgstr "時刻:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "検索" - -#: widgets.py:260 -msgid "Add Another" -msgstr "追加" - -#: widgets.py:302 -msgid "Currently:" -msgstr "現在の値:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ログイン" -#: widgets.py:303 -msgid "Change:" -msgstr "変更後:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s 管理" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "ページが見つかりません" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "申し訳ありませんが、お探しのページは見つかりませんでした。" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "ホーム" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "サーバーエラー" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "サーバーエラー (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "サーバーエラー (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -367,120 +357,142 @@ "エラーが発生しました。サイト管理者にメールで報告されたので、修正されるまでし" "ばらくお待ちください。" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "選択された操作を実行" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "実行" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "全ページの項目を選択するにはここをクリック" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "%(total_count)s個ある%(module_name)s を全て選択" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "選択を解除" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"まずユーザー名とパスワードを登録してください。その後詳細情報が編集可能になり" +"ます。" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "ユーザー名とパスワードを入力してください。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "パスワードの変更" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "下記のエラーを修正してください。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "下記のエラーを修正してください。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"%(username)sさんの新しいパスワードを入力してください。" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "パスワード" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "パスワード(確認用)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "確認のため、再度パスワードを入力してください。" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "ようこそ" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "ドキュメント" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "パスワードの変更" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "ログアウト" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django サイト管理" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django 管理サイト" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "追加" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "履歴" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "サイト上で表示" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "下記のエラーを修正してください。" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "下記のエラーを修正してください。" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s を追加" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "フィルター" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "ソート条件から外します" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "ソート優先順位: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "昇順降順を切り替えます" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "削除" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -491,7 +503,7 @@ "除しようとしましたが、あなたのアカウントには以下のタイプのオブジェクトを削除" "するパーミッションがありません:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -500,7 +512,7 @@ "%(object_name)s '%(escaped_object)s' を削除するには以下の保護された関連オブ" "ジェクトを削除することになります:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -509,16 +521,16 @@ "%(object_name)s \"%(escaped_object)s\"を削除しますか？ 関連づけられている以下" "のオブジェクトも全て削除されます:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "はい。" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "複数のオブジェクトを削除します" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -528,7 +540,7 @@ "選択した %(objects_name)s を削除すると関連するオブジェクトも削除しますが、あ" "なたのアカウントは以下のオブジェクト型を削除する権限がありません:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -537,7 +549,7 @@ "選択した %(objects_name)s を削除すると以下の保護された関連オブジェクトを削除" "することになります:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -546,41 +558,56 @@ "本当に選択した %(objects_name)s を削除しますか？ 以下の全てのオブジェクトと関" "連する要素が削除されます:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "削除" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "%(verbose_name)s の追加" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "削除しますか?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s で絞り込む" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s アプリケーション内のモデル" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "変更" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "変更のためのパーミッションがありません。" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "最近行った操作" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "操作" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "利用不可" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "不明なコンテント" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -589,27 +616,27 @@ "データベースの設定に問題があるようです。適切なテーブルが作られていること、適" "切なユーザーでデータベースのデータを読み込めることを確認してください。" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "パスワード:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "パスワードまたはユーザー名を忘れましたか？" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "日付/時刻" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "ユーザー" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "操作" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -617,112 +644,60 @@ "このオブジェクトには変更履歴がありません。おそらくこの管理サイトで追加したも" "のではありません。" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "全件表示" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "保存" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "検索" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "結果 %(counter)s" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "全 %(full_result_count)s 件" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "新規保存" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "保存してもう一つ追加" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "保存して編集を続ける" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"まずユーザー名とパスワードを登録してください。その後詳細情報が編集可能になり" -"ます。" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "ユーザー名とパスワードを入力してください。" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"%(username)sさんの新しいパスワードを入力してください。" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "パスワード" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "パスワード(確認用)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "確認のため、再度パスワードを入力してください。" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "削除" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "%(verbose_name)s の追加" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "削除しますか?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ご利用ありがとうございました。" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "もう一度ログイン" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "パスワードの変更" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "パスワードを変更しました" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "あなたのパスワードは変更されました" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -730,64 +705,48 @@ "セキュリティ上の理由から元のパスワードの入力が必要です。新しいパスワードは正" "しく入力したか確認できるように二度入力してください。" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "元のパスワード" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "新しいパスワード" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "パスワードの変更" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "パスワードをリセット" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "パスワードがリセットされました" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "パスワードがセットされました。ログインしてください。" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "パスワードリセットの確認" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "新しいパスワードを入力してください" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "確認のために、新しいパスワードを二回入力してください。" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "新しいパスワード:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "新しいパスワード (確認用) :" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "パスワードのリセットに失敗しました" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -795,12 +754,7 @@ "パスワードリセットのリンクが不正です。おそらくこのリンクは既に使われていま" "す。もう一度パスワードリセットしてください。" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "パスワードをリセットしました" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -808,7 +762,7 @@ "送信されたメールアドレスに、パスワードを変更する方法をメールしました。受け" "取った内容を確認してください。" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -816,7 +770,7 @@ "メールが届かない場合は、登録したメールアドレスを入力したか確認し、スパムフォ" "ルダに入っていないか確認してください。" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -825,24 +779,24 @@ "このメールは %(site_name)s で、あなたのアカウントのパスワードリセットが要求さ" "れたため、送信されました。" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "次のページで新しいパスワードを選んでください:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "あなたのユーザー名 (念のため):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "ご利用ありがとうございました！" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr " %(site_name)s チーム" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -850,28 +804,52 @@ "パスワードを忘れましたか? メールアドレスを以下に入力すると、新しいパスワード" "の設定方法をお知らせします。" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "メールアドレス:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "パスワードをリセット" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "いつでも" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(なし)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s を選択" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "変更する %s を選択" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "日付:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "時刻:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "検索" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "追加" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "現在の値:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "変更後:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ka/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,15 +2,15 @@ # # Translators: # André Bouatchidzé , 2013 -# David Avsajanishvili , 2011 +# 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/" "ka/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: ka\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "მისაწვდომი %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "ეს არის მისაწვდომი %s-ის სია. ზოგიერთი მათგანის ასარჩევად, მონიშვნით ისინი " "ქვედა სარკმელში და დააწკაპუნეთ ორ სარკმელს შორის მდებარე ისარზე \"არჩევა\" ." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "აკრიფეთ ამ სარკმელში მისაწვდომი %s-ის სიის გასაფილტრად." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "ფილტრი" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "ავირჩიოთ ყველა" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "დააწკაპუნეთ ერთდროულად ყველა %s-ის ასარჩევად." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "არჩევა" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "წავშალოთ" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "არჩეული %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,21 +74,23 @@ "ქვედა სარკმელში და დააწკაპუნეთ ორ სარკმელს შორის მდებარე ისარზე \"მოშორება" "\" ." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "ყველას მოშორება" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "დააწკაპუნეთ ყველა არჩეული %s-ის ერთდროულად მოსაშორებლად." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s-დან არჩეულია %(sel)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "ცალკეულ ველებში შეუნახავი ცვლილებები გაქვთ! თუ მოქმედებას შეასრულებთ, " "შეუნახავი ცვლილებები დაიკარაგება." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "აგირჩევიათ მოქმედება, მაგრამ ცალკეული ველები ჯერ არ შეგინახიათ! გთხოვთ, " "შენახვისთვის დააჭიროთ OK. მოქმედების ხელახლა გაშვება მოგიწევთ." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +118,84 @@ "აგირჩევიათ მოქმედება, მაგრამ ცალკეულ ველებში ცვლილებები არ გაგიკეთებიათ! " "სავარაუდოდ, ეძებთ ღილაკს \"Go\", და არა \"შენახვა\"" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"იანვარი თებერვალი მარტი აპრილი მაისი ივნისი ივლისი აგვისტო სექტემბერი " -"ოქტომბერი ნოემბერი დეკემბერი" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "კ ო ს ო ხ პ შ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "ვაჩვენოთ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "დავმალოთ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ახლა" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "საათი" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "ავირჩიოთ დრო" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "შუაღამე" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "დილის 6 სთ" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "შუადღე" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "უარი" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "დღეს" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "კალენდარი" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "გუშინ" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "ხვალ" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"იანვარი თებერვალი მარტი აპრილი მაისი ივნისი ივლისი აგვისტო სექტემბერი " +"ოქტომბერი ნოემბერი დეკემბერი" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "კ ო ს ო ხ პ შ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "ვაჩვენოთ" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "დავმალოთ" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ka/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ka/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ka/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ka/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ka/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: -# 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 09:08+0000\n" +"Last-Translator: André Bouatchidzé \n" "Language-Team: Georgian (http://www.transifex.com/projects/p/django/language/" "ka/)\n" "MIME-Version: 1.0\n" @@ -19,62 +19,68 @@ "Language: ka\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s წარმატებით წაიშალა." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s ვერ იშლება" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "დარწმუნებული ხართ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "არჩეული %(verbose_name_plural)s-ის წაშლა" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "ადმინისტრირება" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "ყველა" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "კი" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "არა" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "გაურკვეველი" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "ნებისმიერი თარიღი" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "დღეს" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "ბოლო 7 დღე" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "მიმდინარე თვე" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "მიმდინარე წელი" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,94 +89,91 @@ "გთხოვთ, შეიყვანოთ სწორი %(username)s და პაროლი პერსონალის ანგარიშისთვის. " "იქონიეთ მხედველობაში, რომ ორივე ველი ითვალისწინებს მთავრულს." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "გთხოვთ, შეხვიდეთ კიდევ ერთხელ, რადგანაც თქვენი სესიის დრო ამოიწურა." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "მოქმედება:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "მოქმედების დრო" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "ობიექტის id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "ობიექტის წარმ." -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "მოქმედების დროშა" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "შეცვლის შეტყობინება" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ლოგის ერთეული" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "ლოგის ერთეულები" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "დამატებულია \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "შეცვლილია \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "წაშლილია \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "ჟურნალის ჩანაწერის ობიექტი" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "არცერთი" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s შეცვლილია." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "და" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "დამატებულია %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "შეცვლილია %(list)s for %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "წაშლილია %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "არცერთი ველი არ შეცვლილა." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -178,7 +181,7 @@ "%(name)s \"%(obj)s\" წარმატებით დაემატა. შეგიძლიათ განაგრძოთ მისი " "რედაქტირება." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +190,12 @@ "%(name)s \"%(obj)s\" წარმატებით იქნა დამატებული. თქვენ შეგიძლიათ დაამატოთ " "სხვა %(name)s ქვემოთ." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" წარმატებით დაემატა." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ "%(name)s \"%(obj)s\" წარმატებით შეიცვალა. თქვენ შეგიძლიათ ისევ დაარედაქტიროთ " "ის ქვემოთ." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "%(name)s \"%(obj)s\" წარმატებით შეიცვალა. თქვენ შეგიძლიათ დაამატოთ სხვა " "%(name)s ქვემოთ." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" წარმატებით შეიცვალა." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,147 +226,135 @@ "ობიექტებზე მოქმედებების შესასრულებლად ისინი არჩეული უნდა იყოს. არცერთი " "ობიექტი არჩეული არ არის." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "მოქმედება არჩეული არ არის." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "დავამატოთ %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" წარმატებით წაიშალა." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-ის ობიექტი პირველადი გასაღებით %(key)r არ არსებობს." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "დავამატოთ %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "შევცვალოთ %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "მონაცემთა ბაზის შეცდომა" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s წარმატებით შეიცვალა." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s-ია არჩეული" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s-დან არცერთი არჩეული არ არის" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" წარმატებით წაიშალა." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "ცვლილებების ისტორია: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "შესვლა" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django-ს ადმინისტრირების საიტი" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django-ს ადმინისტრირება" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "საიტის ადმინისტრირება" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s ადმინისტრირება" - -#: widgets.py:90 -msgid "Date:" -msgstr "თარიღი;" - -#: widgets.py:91 -msgid "Time:" -msgstr "დრო:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "ძიება" - -#: widgets.py:260 -msgid "Add Another" -msgstr "ახლის დამატება" - -#: widgets.py:302 -msgid "Currently:" -msgstr "ამჟამად:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "შესვლა" -#: widgets.py:303 -msgid "Change:" -msgstr "შეცვლა:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s ადმინისტრირება" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "გვერდი ვერ მოიძებნა" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "უკაცრავად, მოთხოვნილი გვერდი ვერ მოიძებნა." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "საწყისი გვერდი" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "სერვერის შეცდომა" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "სერვერის შეცდომა (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "სერვერის შეცდომა (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -371,120 +362,142 @@ "მოხდა შეცდომა. ინფორმაცია მასზე გადაეცა საიტის ადმინისტრატორებს ელ. ფოსტით " "და ის უნდა შესწორდეს უმოკლეს ვადებში. გმადლობთ მოთმინებისთვის." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "არჩეული მოქმედების შესრულება" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "გადასვლა" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "ყველა გვერდზე არსებული ობიექტის მოსანიშნად დააწკაპეთ აქ" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "ყველა %(total_count)s %(module_name)s-ის მონიშვნა" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "მონიშვნის გასუფთავება" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"ჯერ შეიყვანეთ მომხმარებლის სახელი და პაროლი. ამის შემდეგ თქვენ გექნებათ " +"მომხმარებლის სხვა ოპციების რედაქტირების შესაძლებლობა." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "შეიყვანეთ მომხმარებლის სახელი და პაროლი" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "პაროლის შეცვლა" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "გთხოვთ, გაასწოროთ შეცდომები." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"შეიყვანეთ ახალი პაროლი მომხმარებლისათვის %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "პაროლი" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "პაროლი (განმეორებით)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "შეიყვანეთ იგივე პაროლი, დამოწმებისათვის." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "კეთილი იყოს თქვენი მობრძანება," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "დოკუმენტაცია" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "პაროლის შეცვლა" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "გამოსვლა" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django-ს ადმინისტრირების საიტი" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django-ს ადმინისტრირება" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "დამატება" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "ისტორია" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "წარმოდგენა საიტზე" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "გთხოვთ, გაასწოროთ შეცდომები." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "დავამატოთ %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "ფილტრი" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "დალაგებიდან მოშორება" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "დალაგების პრიორიტეტი: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "დალაგების გადართვა" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "წავშალოთ" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -495,7 +508,7 @@ "დაკავშირებული ობიექტების წაშლას, მაგრამ თქვენ არა გაქვთ შემდეგი ტიპების " "ობიექტების წაშლის უფლება:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -504,7 +517,7 @@ "%(object_name)s ტიპის '%(escaped_object)s' ობიექტის წაშლა მოითხოვს ასევე " "შემდეგი დაკავშირებული ობიექტების წაშლას:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -513,16 +526,16 @@ "ნამდვილად გსურთ, წაშალოთ %(object_name)s \"%(escaped_object)s\"? ყველა " "ქვემოთ მოყვანილი დაკავშირებული ობიექტი წაშლილი იქნება:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "კი, ნამდვილად" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "რამდენიმე ობიექტის წაშლა" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -532,7 +545,7 @@ "%(objects_name)s ტიპის ობიექტის წაშლა ითხოვს ასევე შემდეგი ობიექტების " "წაშლას, მაგრამ თქვენ არ გაქვთ ამის ნებართვა:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -541,7 +554,7 @@ "არჩეული %(objects_name)s ობიექტის წაშლა მოითხოვს ასევე შემდეგი დაცული " "დაკავშირეული ობიექტების წაშლას:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -550,41 +563,56 @@ "დარწმუნებული ხართ, რომ გსურთ %(objects_name)s ობიექტის წაშლა? ყველა შემდეგი " "ობიექტი, და მათზე დამოკიდებული ჩანაწერები წაშლილი იქნება:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "წაშლა" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "კიდევ ერთი %(verbose_name)s-ის დამატება" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "წავშალოთ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s მიხედვით " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "მოდელები %(name)s აპლიკაციაში" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "შეცვლა" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "თქვენ არა გაქვთ რედაქტირების უფლება." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "ბოლო მოქმედებები" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "ჩემი მოქმედებები" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "არ არის მისაწვდომი" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "უცნობი შიგთავსი" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -594,27 +622,27 @@ "ბაზის შესაბამისი ცხრილები შექმნილია, და მონაცემთა ბაზის წაკითხვა შეუძლია " "შესაბამის მომხმარებელს." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "პაროლი:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "დაგავიწყდათ თქვენი პაროლი ან მომხმარებლის სახელი?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "თარიღი/დრო" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "მომხმარებელი" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "მოქმედება" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -622,112 +650,60 @@ "ამ ობიექტს ცვლილებების ისტორია არა აქვს. როგორც ჩანს, იგი არ იყო დამატებული " "ადმინისტრირების საიტის მეშვეობით." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "ვაჩვენოთ ყველა" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "შევინახოთ" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "ძებნა" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s შედეგი" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "სულ %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "შევინახოთ, როგორც ახალი" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "შევინახოთ და დავამატოთ ახალი" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "შევინახოთ და გავაგრძელოთ რედაქტირება" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"ჯერ შეიყვანეთ მომხმარებლის სახელი და პაროლი. ამის შემდეგ თქვენ გექნებათ " -"მომხმარებლის სხვა ოპციების რედაქტირების შესაძლებლობა." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "შეიყვანეთ მომხმარებლის სახელი და პაროლი" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"შეიყვანეთ ახალი პაროლი მომხმარებლისათვის %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "პაროლი" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "პაროლი (განმეორებით)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "შეიყვანეთ იგივე პაროლი, დამოწმებისათვის." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "წაშლა" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "კიდევ ერთი %(verbose_name)s-ის დამატება" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "წავშალოთ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "გმადლობთ, რომ დღეს ამ საიტთან მუშაობას დაუთმეთ დრო." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ხელახლა შესვლა" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "პაროლის შეცვლა" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "პაროლი წარმატებით შეიცვალა" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "თქვენი პაროლი შეიცვალა." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -735,48 +711,36 @@ "გთხოვთ, უსაფრთხოების დაცვის მიზნით, შეიყვანოთ თქვენი ძველი პაროლი, შემდეგ კი " "ახალი პაროლი ორჯერ, რათა დარწმუნდეთ, რომ იგი შეყვანილია სწორად." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "ძველი პაროლი" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "ახალი პაროლი" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "შევცვალოთ ჩემი პაროლი" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "პაროლის აღდგენა" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "პაროლის აღდგენა დასრულებულია" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "თქვენი პაროლი დაყენებულია. ახლა შეგიძლიათ გადახვიდეთ შემდეგ გვერდზე და " "შეხვიდეთ სისტემაში." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "პაროლი შეცვლის დამოწმება" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "შეიყვანეთ ახალი პაროლი:" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -784,19 +748,15 @@ "გთხოვთ, შეიყვანეთ თქვენი ახალი პაროლი ორჯერ, რათა დავრწმუნდეთ, რომ იგი " "სწორად ჩაბეჭდეთ." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "ახალი პაროლი:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "პაროლის დამოწმება:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "პაროლის აღდგენა წარუმატებლად დასრულდა" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -804,12 +764,7 @@ "პაროლის აღდგენის ბმული არასწორი იყო, შესაძლოა იმის გამო, რომ იგი უკვე ყოფილა " "გამოყენებული. გთხოვთ, კიდევ ერთხელ სცადოთ პაროლის აღდგენა." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "პაროლის აღდგენა წარმატებით დასრულდა" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -817,13 +772,13 @@ "ჩვენ გამოვაგზავნეთ მითითებები პაროლის დასაყენებლად ელ. ფოსტის მისამართზე, " "რომელიც თქვენ შეიყვანეთ. თქვენ მალე უნდა მიიღოთ ისინი." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -832,24 +787,24 @@ "თქვენ მიიღეთ ეს წერილი იმიტომ, რომ გააკეთეთ პაროლის თავიდან დაყენების " "მოთხოვნა თქვენი მომხმარებლის ანგარიშისთვის %(site_name)s-ზე." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "გთხოვთ, გადახვიდეთ შემდეგ გვერდზე და აირჩიოთ ახალი პაროლი:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "თქვენი მომხმარებლის სახელი (თუ დაგავიწყდათ):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "გმადლობთ, რომ იყენებთ ჩვენს საიტს!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s საიტის გუნდი" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -857,28 +812,52 @@ "დაგავიწყდათ თქვენი პაროლი? შეიყვანეთ თქვენი ელ. ფოსტის მისამართი ქვემოთ და " "ჩვენ გამოგიგზავნით მითითებებს ახალი პაროლის დასაყენებლად." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "ელ. ფოსტის მისამართი:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "აღვადგინოთ ჩემი პაროლი" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "ყველა თარიღი" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(არცერთი)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "ავირჩიოთ %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "აირჩიეთ %s შესაცვლელად" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "თარიღი;" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "დრო:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "ძიება" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "ახლის დამატება" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "ამჟამად:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "შეცვლა:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/kk/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Nurlan Rakhimzhanov , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/" "kk/)\n" "MIME-Version: 1.0\n" @@ -17,71 +17,73 @@ "Language: kk\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s бар" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Сүзгіш" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Өшіру(жою)" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s-ң %(sel)s-ы(і) таңдалды" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -89,7 +91,8 @@ "Сіздің төмендегі өзгермелі алаңдарда(fields) өзгерістеріңіз бар. Егер артық " "әрекет жасасаңызб сіз өзгерістеріңізді жоғалтасыз." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -98,7 +101,8 @@ "Сіз өз өзгерістеріңізді сақтамай, әрекет жасадыңыз. Өтініш, сақтау үшін ОК " "батырмасын басыңыз және өз әрекетіңізді қайта жасап көріңіз. " -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -107,70 +111,84 @@ "Сіз Сақтау батырмасына қарағанда, Go(Алға) батырмасын іздеп отырған " "боларсыз, себебі ешқандай өзгеріс жасамай, әрекет жасадыңыз." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Қаңтар Ақпан Наурыз Сәуір Мамыр Маусым Шілде Тамыз Қыркүйек Қазан Қараша " -"Желтоқсан" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Ж Д С С Б Ж С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Көрсету" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Жасыру" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Қазір" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Сағат" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Уақытты таңда" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Түн жарым" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "06" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Талтүс" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Болдырмау" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Бүгін" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Күнтізбе" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Кеше" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Ертең" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Қаңтар Ақпан Наурыз Сәуір Мамыр Маусым Шілде Тамыз Қыркүйек Қазан Қараша " +"Желтоқсан" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Ж Д С С Б Ж С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Көрсету" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Жасыру" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/kk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/kk/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/kk/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/kk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/kk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Kazakh (http://www.transifex.com/projects/p/django/language/" "kk/)\n" @@ -18,223 +18,231 @@ "Language: kk\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Таңдалған %(count)d %(items)s элемент өшірілді." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s өшіре алмайды" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Сенімдісіз бе?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Таңдалған %(verbose_name_plural)s өшірілді" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Барлығы" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Иә" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Жоқ" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Белгісіз" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Кез келген күн" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Бүгін" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Өткен 7 күн" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Осы ай" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Осы жыл" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Сіздің сессия уақытыңыз өтіп кентті, өтініш, қайты кіріп көріңіз," - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Әрекет:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "әрекет уақыты" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "объекттің id-i" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "объекттің repr-i" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "әрекет белгісі" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "хабарламаны өзгерту" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "Жорнал жазуы" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "Жорнал жазулары" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ешнәрсе" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s өзгертілді." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "және" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" қосылды." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "\"%(object)s\" %(name)s-нің %(list)s өзгертілді." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" өшірілді." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ешқандай толтырма өзгермеді." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" сәтті қосылды. Оны төменде өзгерте аласыз." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" сәтті қосылды." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" сәтті өзгертілді." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Бірнәрсені өзгерту үшін бірінші оларды таңдау керек. Ешнәрсе өзгертілмеді." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ешқандай әрекет таңдалмады." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s қосу" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" сәтті өшірілді." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Бірінші кілті %(key)r бар %(name)s объекті жоқ." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s қосу" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s өзгету" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Мәліметтер базасының қатесі" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -243,7 +251,7 @@ "\n" "other: %(count)s %(name)s таңдалғандарының барі өзгертілді." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -252,233 +260,238 @@ "\n" "other: Барлығы %(total_count)s таңдалды" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 of %(cnt)s-ден 0 таңдалды" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" сәтті өшірілді." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Өзгерес тарихы: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Кіру" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Даңғо сайтының әкімі" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Даңғо әкімшілігі" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Сайт әкімшілігі" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s әкімшілігі" - -#: widgets.py:90 -msgid "Date:" -msgstr "Күнтізбелік күн:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Уақыт:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Іздеу" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Тағы қосу" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Кіру" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Бет табылмады" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Кешірім сұраймыз, сіздің сұраған бетіңіз табылмады." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Негізгі" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Сервердің қатесі" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Сервердің қатесі (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Сервердің қатесі (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Таңдалған әрәкетті іске қосу" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Алға" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Осы беттегі барлық объекттерді таңдау үшін осы жерді шертіңіз" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Осылардың %(total_count)s %(module_name)s барлығын таңдау" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Белгілерді өшіру" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Алдымен, пайдаланушының атын және құпия сөзді енгізіңіз. Содан соң, тағы " +"басқа пайдаланушы параметрлерін енгізе аласыз." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Пайдаланушының атын және құпия сөзді енгізіңіз." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Құпия сөзді өзгерту" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" +"one: Астындағы қатені дұрыстаңыз.\n" +"other: Астындағы қателерді дұрыстаңыз." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"%(username)s пайдаланушы үшін жаңа құпия сөзді енгізіңіз." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Құпия сөз" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Құпия сөз(қайтадан)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Растау үшін жоғардағыдай құпия сөзді енгізіңіз." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Қош келдіңіз," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Құжаттама" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Құпия сөзді өзгерту" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Шығу" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Даңғо сайтының әкімі" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Даңғо әкімшілігі" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Қосу" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Тарих" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Сайтта көру" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" -"one: Астындағы қатені дұрыстаңыз.\n" -"other: Астындағы қателерді дұрыстаңыз." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s қосу" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Сүзгіз" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Өшіру" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -488,7 +501,7 @@ "%(object_name)s '%(escaped_object)s' объектты өшіруы байланысты объекттерін " "өшіруді қажет етеді, бырақ сізде осындай объектерді өшіру рұқсаты жоқ:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -497,7 +510,7 @@ "%(object_name)s '%(escaped_object)s' объектті өшіру осындай байлансты " "объекттерды өшіруді қажет етеді:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -506,16 +519,16 @@ "%(object_name)s \"%(escaped_object)s\" объекттерді өшіруге сенімдісіз бе? " "Бұл байланысты элементтер де өшіріледі:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Иә, сенімдімін" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Бірнеше объекттерді өшіру" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -525,7 +538,7 @@ "%(objects_name)s объектты өшіруы байланысты объекттерін өшіруді қажет етеді, " "бырақ сізде осындай объектерді өшіру рұқсаты жоқ:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -534,7 +547,7 @@ "Таңдалған %(objects_name)s-ді(ы) өшіру, онымен байланыстағы қорғалған " "объектілердің барлығын жояды:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -543,41 +556,56 @@ "Таңдаған %(objects_name)s объектіңізді өшіруге сенімдісіз бе? Себебі, " "таңдағын объектіліріңіз және онымен байланыстағы барлық элементтер жойылады:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Өшіру" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Тағы басқа %(verbose_name)s кос" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Өшіру?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Өзгетру" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Бірденке түзетуге рұқсатыңыз жоқ." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Соңғы әрекеттер" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Менің әрекеттерім" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Қол жетімдісі жоқ" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Белгісіз мазмұн" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -586,139 +614,87 @@ "Дерекқор орнатуыңызда бір қате бар. Дерекқор кестелері дұрыс құрылғаның және " "дерекқор көрсетілген дерекқор пайдаланушыда оқұ рұқсаты бар." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Құпия сөз:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Өшіру/Уақыт" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Қолданушы" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Әрекет" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" "Бұл объекттың өзгерту тарихы жоқ. Мүмкін ол бұл сайт арқылы енгізілген жоқ." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Барлығын көрсету" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Сақтау" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Іздеу" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s нәтиже" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "Барлығы %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Жаңадан сақтау" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Сақта және жаңасын қос" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Сақта және өзгертуді жалғастыр" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Алдымен, пайдаланушының атын және құпия сөзді енгізіңіз. Содан соң, тағы " -"басқа пайдаланушы параметрлерін енгізе аласыз." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Пайдаланушының атын және құпия сөзді енгізіңіз." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"%(username)s пайдаланушы үшін жаңа құпия сөзді енгізіңіз." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Құпия сөз" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Құпия сөз(қайтадан)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Растау үшін жоғардағыдай құпия сөзді енгізіңіз." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Өшіру" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Тағы басқа %(verbose_name)s кос" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Өшіру?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Бүгін Веб-торапқа уақыт бөлгеніңіз үшін рахмет." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Қайтадан кіріңіз" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Құпия сөзді өзгерту" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Құпия сөз сәтті өзгертілді" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Құпия сөзіңіз өзгертілді." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -726,64 +702,48 @@ "Ескі құпия сөзіңізді енгізіңіз, содан сон сенімді болу үшін жаңа құпия " "сөзіңізді екі рет енгізіңіз." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Ескі құпия сөз" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Жаңа құпия сөз" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Құпия сөзімді өзгерту" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Құпия сөзді өзгерту" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Құпия сөзді өзгерту бітті" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Сіздің құпия сөзіңіз енгізілді. Жүйеге кіруіңізге болады." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Құпия сөзді өзгерту растау" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Жаңа құпия сөзді енгізіңіз" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Сенімді болу үшін жаңа құпия сөзіңізді екі рет енгізіңіз." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Жаңа құпия сөз:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Құпия сөз (растау):" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Құпия сөзді өзгертуы сәтсіз аяқталды" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -791,75 +751,94 @@ "Құпия сөзді өзгерту байланыс дұрыс емес, мүмкін ол осыған дейін " "пайдаланылды. Жаңа құпия сөзді өзгерту сұрау жіберіңіз." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Құпия сөз сәтті өзгертілді" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Жаңа құпия сөзді тандау үшін мынау бетке кіріңіз:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Егер ұмытып қалған болсаңыз, пайдалануш атыңыз:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Біздің веб-торабын қолданғаныңыз үшін рахмет!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s тобы" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Құпия сөзді жаңала" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Барлық мерзімдер" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ешнарсе)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s таңда" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s өзгерту үщін таңда" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Күнтізбелік күн:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Уақыт:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Іздеу" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Тағы қосу" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/km/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Khmer (http://www.transifex.com/projects/p/django/language/" "km/)\n" "MIME-Version: 1.0\n" @@ -17,154 +17,172 @@ "Language: km\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s ដែលអាច​ជ្រើសរើសបាន" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "ស្វែងរកជាមួយ" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "ជ្រើសរើសទាំងអស់" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "លប់ចេញ" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s ដែលបានជ្រើសរើស" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"January February March April May June July August September October November " -"December" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T W T F S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ឥឡូវនេះ" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "នាឡិការ" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "ជ្រើសរើសម៉ោង" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "អធ្រាត្រ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "ម៉ោង ៦ ព្រឹក" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "ពេលថ្ងែត្រង់" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "លប់ចោល" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "ថ្ងៃនេះ" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "ប្រក្រតិទិន" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "ម្សិលមិញ" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "ថ្ងៃស្អែក" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"January February March April May June July August September October November " +"December" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T W T F S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/km/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/km/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/km/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/km/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/km/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Khmer (http://www.transifex.com/projects/p/django/language/" "km/)\n" @@ -17,156 +17,159 @@ "Language: km\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "តើលោកអ្នកប្រាកដទេ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "ទាំងអស់" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "យល់ព្រម" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "មិនយល់ព្រម" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "មិន​ដឹង" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "កាល​បរិច្ឆេទណាមួយ" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "ថ្ងៃនេះ" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "៧​ថ្ងៃ​កន្លង​មក" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "ខែ​នេះ" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "ឆ្នាំ​នេះ" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "ពេលវេលាប្រតិបត្តិការ" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "លេខ​សំគាល់​កម្មវិធី (object id)" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "object repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "សកម្មភាព" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ផ្លាស់ប្តូរ" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "កំណត់ហេតុ" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "កំណត់ហេតុ" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "បានផ្លាស់ប្តូរ %s" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "និង" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "ពុំមានទិន្នន័យត្រូវបានផ្លាស់ប្តូរ។" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -174,303 +177,311 @@ "ឈ្មោះកម្មវីធី %(name)s \"%(obj)s\" ត្រូវបានបន្ថែមដោយជោគជ័យ។" " លោកអ្នកអាចផ្លាស់ប្តូរម្តងទៀតនៅខាងក្រោម។" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" បានបញ្ជូលដោយជោគជ័យ​។" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "កម្មវិធីឈ្មោះ %(name)s \"%(obj)s\" ត្រូវបានផ្លាស់ប្តូរដោយជោគជ័យ។" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "បន្ថែម %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" ត្រូវបានលប់ដោយជោគជ័យ។" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "បន្ថែម %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "ផ្លាស់ប្តូរ %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "ទិន្នន័យមូលដ្ឋានមានបញ្ហា" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "ឈ្មោះកម្មវិធី %(name)s \"%(obj)s\" ត្រូវបានលប់ដោយជោគជ័យ។" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "សកម្មភាពផ្លាស់ប្តូរកន្លងមក : %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ពិនិត្យចូល" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ទំព័រគ្រប់គ្រងរបស់ Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ការ​គ្រប់គ្រង​របស់ ​Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "ទំព័រគ្រប់គ្រង" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "កាលបរិច្ឆេទ" - -#: widgets.py:91 -msgid "Time:" -msgstr "ម៉ោង" - -#: widgets.py:165 -msgid "Lookup" -msgstr "" - -#: widgets.py:260 -msgid "Add Another" -msgstr "" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ពិនិត្យចូល" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "ទំព័រ​ដែល​លោកអ្នកចង់​រក​នេះពុំមាន​នៅក្នុងម៉ាស៊ីនរបស់យើងខ្ញុំទេ" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "សួមអភ័យទោស ទំព័រ​ដែល​លោកអ្នកចង់​រក​នេះពុំមាន​នឹងក្នុងម៉ាស៊ីនរបស់យើងខ្ញុំទេ" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "គេហទំព័រ" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "ម៉ាស៊ីនផ្តល់សេវាកម្ម​ មានបញ្ហា" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "ម៉ាស៊ីនផ្តល់សេវាកម្ម​ មានបញ្ហា (៥០០)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "ម៉ាស៊ីនផ្តល់សេវាកម្ម​ មានបញ្ហា  (៥០០)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "ស្វែងរក" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"តំបូងសូមបំពេញ ឈ្មោះជាសមាជិក និង ពាក្យសំងាត់​។ បន្ទាប់មកលោកអ្នកអាចបំពេញបន្ថែមជំរើសផ្សេងៗទៀតបាន។ " + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "ពាក្យសំងាត់" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "ពាក្យសំងាត់ (ម្តងទៀត)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ " + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "សូមស្វាគមន៏" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "ឯកសារ" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "ចាកចេញ" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ទំព័រគ្រប់គ្រងរបស់ Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ការ​គ្រប់គ្រង​របស់ ​Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "បន្ថែម" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "សកម្មភាព​កន្លង​មក" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "មើលនៅលើគេហទំព័រដោយផ្ទាល់" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "បន្ថែម %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "ស្វែងរកជាមួយ" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "លប់" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -480,14 +491,14 @@ "ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយ​កម្មវិធីដែលពាក់​ព័ន្ធបាត់បង់ ។" " ក៏ប៉ន្តែលោកអ្នក​ពុំមាន​សិទ្ធិលប់​កម្មវិធី​ប្រភេទនេះទេ។" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -496,16 +507,16 @@ "តើលោកអ្នកប្រាកដជាចង់លប់ %(object_name)s \"%(escaped_object)s" "\"? ការលប់ %(object_name)s '%(escaped_object)s' អាចធ្វើអោយ​កម្មវិធីដែលពាក់​ព័ន្ធបាត់បង់។" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "ខ្ញុំច្បាស់​ជាចង់លប់" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -513,55 +524,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "លប់ចេញ" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "ដោយ​  %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "ផ្លាស់ប្តូរ" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "លោកអ្នកពុំមានសិទ្ធិ ផ្លាស់​ប្តូរ ទេ។" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "សកម្មភាពបច្ចុប្បន្ន" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "សកម្មភាពរបស់ខ្ញុំ" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "គ្មាន" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -570,274 +596,227 @@ "មូលដ្ឋាន​ទិន្នន័យ​​​ របស់លោកអ្នក មានបញ្ហា។ តើ លោកអ្នកបាន បង្កើត តារាង​ របស់មូលដ្ឋានទិន្នន័យ​" " ហើយឬនៅ? តើ​ លោកអ្នកប្រាកដថាសមាជិកអាចអានមូលដ្ឋានទិន្នន័យនេះ​​បានឬទេ? " -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "ពាក្យ​សំងាត់" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Date/time" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "សមាជិក" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "សកម្មភាព" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" "កម្មវិធីនេះមិនមានសកម្មភាព​កន្លងមកទេ។ ប្រហែលជាសកម្មភាពទាំងនេះមិនបានធ្វើនៅទំព័រគ្រប់គ្រងនេះ។" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "បង្ហាញទាំងអស់" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "រក្សាទុក" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "សរុបទាំងអស់ %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "រក្សាទុក" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "រក្សាទុក ហើយ បន្ថែម​ថ្មី" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "រក្សាទុក ហើយ កែឯកសារដដែល" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"តំបូងសូមបំពេញ ឈ្មោះជាសមាជិក និង ពាក្យសំងាត់​។ បន្ទាប់មកលោកអ្នកអាចបំពេញបន្ថែមជំរើសផ្សេងៗទៀតបាន។ " - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "ពាក្យសំងាត់" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "ពាក្យសំងាត់ (ម្តងទៀត)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "សូមបំពេញពាក្យសំងាត់ដូចខាងលើ ដើម្បីត្រួតពិនិត្យ។ " - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "លប់ចេញ" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "សូមថ្លែងអំណរគុណ ដែលបានចំណាយ ពេលវេលាដ៏មានតំលៃ របស់លោកអ្នកមកទស្សនាគេហទំព័ររបស់យើងខ្ញុំ" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ពិនិត្យចូលម្តងទៀត" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "ពាក្យសំងាត់បានផ្លាស់ប្តូរដោយជោគជ័យ" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "ពាក្យសំងាត់របស់លោកអ្នកបានផ្លាស់ប្តូរហើយ" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "សូមបំពេញពាក្យសំងាត់ចាស់របស់លោកអ្នក។ ដើម្បីសុវត្ថភាព សូមបំពេញពាក្យសំងាត់ថ្មីខាងក្រោមពីរដង។" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "ផ្លាស់ប្តូរពាក្យសំងាត់" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "ពាក្យសំងាត់បានកំណត់សារជាថ្មី" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "ពាក្យសំងាត់ថ្មី" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "បំពេញពាក្យសំងាត់ថ្មីម្តងទៀត" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "ពាក្យសំងាត់បានផ្លាស់ប្តូរដោយជោគជ័យ" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "ឈ្មោះជាសមាជិកក្នុងករណីភ្លេច:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "សូមអរគុណដែលបានប្រើប្រាស់សេវាកម្មរបស់យើងខ្ញុំ" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "ក្រុមរបស់គេហទំព័រ %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "កំណត់ពាក្យសំងាត់សារជាថ្មី" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "កាលបរិច្ឆេទទាំងអស់" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "ជ្រើសរើស %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "ជ្រើសរើស %s ដើម្បីផ្លាស់ប្តូរ" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "កាលបរិច្ឆេទ" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "ម៉ោង" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/kn/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # karthikbgl , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/" "kn/)\n" "MIME-Version: 1.0\n" @@ -18,71 +18,73 @@ "Language: kn\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "ಲಭ್ಯ %s " -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "ಶೋಧಕ" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "ಎಲ್ಲವನ್ನೂ ಆಯ್ದುಕೊಳ್ಳಿ" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "ತೆಗೆದು ಹಾಕಿ" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s ಆಯ್ದುಕೊಳ್ಳಲಾಗಿದೆ" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "ಎಲ್ಲಾ ತೆಗೆದುಹಾಕಿ" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -90,82 +92,98 @@ "ನೀವು ಪ್ರತ್ಯೇಕ ತಿದ್ದಬಲ್ಲ ಕ್ಷೇತ್ರಗಳಲ್ಲಿ ಬದಲಾವಣೆ ಉಳಿಸಿಲ್ಲ. ನಿಮ್ಮ ಉಳಿಸದ ಬದಲಾವಣೆಗಳು " "ನಾಶವಾಗುತ್ತವೆ" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "ಜನವರಿ ಫೆಬ್ರುವರಿ ಮಾರ್ಚ್ ಎಪ್ರಿಲ್ ಮೇ ಜೂನ್ ಜುಲೈ ಆಗಸ್ಟ್ ಸೆಪ್ಟೆಂಬರ್ ನವೆಂಬರ್ ಡಿಸೆಂಬರ್" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "ರ ಸೋ ಮ ಬು ಗು ಶು ಶ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "ಪ್ರದರ್ಶನ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "ಮರೆಮಾಡಲು" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ಈಗ" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "ಗಡಿಯಾರ" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "ಸಮಯವೊಂದನ್ನು ಆರಿಸಿ" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "ಮಧ್ಯರಾತ್ರಿ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "ಬೆಳಗಿನ ೬ ಗಂಟೆ " -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "ಮಧ್ಯಾಹ್ನ" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "ರದ್ದುಗೊಳಿಸಿ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "ಈ ದಿನ" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "ಪಂಚಾಂಗ" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "ನಿನ್ನೆ" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "ನಾಳೆ" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "ಜನವರಿ ಫೆಬ್ರುವರಿ ಮಾರ್ಚ್ ಎಪ್ರಿಲ್ ಮೇ ಜೂನ್ ಜುಲೈ ಆಗಸ್ಟ್ ಸೆಪ್ಟೆಂಬರ್ ನವೆಂಬರ್ ಡಿಸೆಂಬರ್" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "ರ ಸೋ ಮ ಬು ಗು ಶು ಶ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "ಪ್ರದರ್ಶನ" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "ಮರೆಮಾಡಲು" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/kn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/kn/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/kn/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/kn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/kn/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Kannada (http://www.transifex.com/projects/p/django/language/" "kn/)\n" @@ -17,156 +17,159 @@ "Language: kn\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "ಖಚಿತಪಡಿಸುವಿರಾ? " -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "ಎಲ್ಲಾ" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "ಹೌದು" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "ಇಲ್ಲ" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "ಗೊತ್ತಿಲ್ಲ(ದ/ದ್ದು)" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "ಯಾವುದೇ ದಿನಾಂಕ" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "ಈದಿನ" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "ಕಳೆದ ೭ ದಿನಗಳು" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "ಈ ತಿಂಗಳು" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "ಈ ವರ್ಷ" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "ಕ್ರಮದ(ಕ್ರಿಯೆಯ) ಸಮಯ" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "ವಸ್ತುವಿನ ಐಡಿ" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "ವಸ್ತು ಪ್ರಾತಿನಿಧ್ಯ" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "ಕ್ರಮದ(ಕ್ರಿಯೆಯ) ಪತಾಕೆ" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ಬದಲಾವಣೆಯ ಸಂದೇಶ/ಸಂದೇಶ ಬದಲಿಸಿ" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ಲಾಗ್ ದಾಖಲೆ" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "ಲಾಗ್ ದಾಖಲೆಗಳು" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s ಬದಲಾಯಿಸಲಾಯಿತು." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ಮತ್ತು" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "ಯಾವುದೇ ಅಂಶಗಳು ಬದಲಾಗಲಿಲ್ಲ." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -174,303 +177,312 @@ "%(name)s \"%(obj)s\" ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು. ನೀವು ಕೆಳಗೆ ಅದನ್ನು ಮತ್ತೆ " "ಬದಲಾಯಿಸಬಹುದು." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr " %(name)s \"%(obj)s\" ಅನ್ನು ಯಶಸ್ವಿಯಾಗಿ ಸೇರಿಸಲಾಯಿತು." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ಸಫಲವಾಗಿ ಬದಲಾಯಿಸಲಾಯಿತು." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s ಸೇರಿಸಿ" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಯಿತು." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s ಸೇರಿಸಿ" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s ಅನ್ನು ಬದಲಿಸು" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "ದತ್ತಸಂಚಯದ ದೋಷ" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" ಯಶಸ್ವಿಯಾಗಿ ಅಳಿಸಲಾಯಿತು." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "ಬದಲಾವಣೆಗಳ ಇತಿಹಾಸ: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ಒಳಗೆ ಬನ್ನಿ" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ಜಾಂಗೋ ತಾಣದ ಆಡಳಿತಗಾರರು" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ಜಾಂಗೋ ಆಡಳಿತ" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "ತಾಣ ನಿರ್ವಹಣೆ" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "ದಿನಾಂಕ:" - -#: widgets.py:91 -msgid "Time:" -msgstr "ಸಮಯ:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "" - -#: widgets.py:260 -msgid "Add Another" -msgstr "" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ಒಳಗೆ ಬನ್ನಿ" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "ಪುಟ ಸಿಗಲಿಲ್ಲ" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "ಕ್ಷಮಿಸಿ, ನೀವು ಕೇಳಿದ ಪುಟ ಸಿಗಲಿಲ್ಲ" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "ಪ್ರಾರಂಭಸ್ಥಳ(ಮನೆ)" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "ಸರ್ವರ್ ದೋಷ" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "ಸರ್ವರ್ ದೋಷ(೫೦೦)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "ಸರ್ವರ್ ದೋಷ(೫೦೦)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "ಹೋಗಿ" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"ಮೊದಲು ಬಳಕೆದಾರ-ಹೆಸರು ಮತ್ತು ಪ್ರವೇಶಪದವನ್ನು ಕೊಡಿರಿ. ನಂತರ, ನೀವು ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳನ್ನು " +"ಬದಲಿಸಬಹುದಾಗಿದೆ." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "ಪ್ರವೇಶಪದ" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "ಖಚಿತಗೊಳಿಸಲು ಮೇಲಿನ ಪ್ರವೇಶಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "ಸುಸ್ವಾಗತ." -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "ವಿವರಮಾಹಿತಿ" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "ಪ್ರವೇಶಪದ ಬದಲಿಸಿ" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "ಹೊರಕ್ಕೆ ಹೋಗಿ" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ಜಾಂಗೋ ತಾಣದ ಆಡಳಿತಗಾರರು" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ಜಾಂಗೋ ಆಡಳಿತ" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "ಸೇರಿಸಿ" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "ಚರಿತ್ರೆ" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "ತಾಣದಲ್ಲಿ ನೋಡಿ" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s ಸೇರಿಸಿ" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "ಸೋಸಕ" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "ಅಳಿಸಿಹಾಕಿ" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -481,30 +493,30 @@ "ಕಳೆದುಹೋಗುತ್ತವೆ. ಆದರೆ ನಿಮ್ಮ ಖಾತೆಗೆ ಕೆಳಕಂಡ ಬಗೆಗಳ ವಸ್ತುಗಳನ್ನು ತೆಗೆದುಹಾಕಲು " "ಅನುಮತಿಯಿಲ್ಲ." -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "ಹೌದು,ನನಗೆ ಖಚಿತವಿದೆ" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -512,55 +524,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "ತೆಗೆದು ಹಾಕಿ" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s ಇಂದ" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "ಬದಲಿಸಿ/ಬದಲಾವಣೆ" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "ಯಾವುದನ್ನೂ ತಿದ್ದಲು ನಿಮಗೆ ಅನುಮತಿ ಇಲ್ಲ ." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "ಇತ್ತೀಚಿನ ಕ್ರಮಗಳು" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "ನನ್ನ ಕ್ರಮಗಳು" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "ಯಾವುದೂ ಲಭ್ಯವಿಲ್ಲ" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -569,138 +596,87 @@ "ಡಾಟಾಬೇಸನ್ನು ಇನ್ಸ್ಟಾಲ್ ಮಾಡುವಾಗ ಏನೋ ತಪ್ಪಾಗಿದೆ. ಸೂಕ್ತ ಡಾಟಾಬೇಸ್ ಕೋಷ್ಟಕಗಳು ರಚನೆಯಾಗಿ ಅರ್ಹ " "ಬಳಕೆದಾರರು ಅವುಗಳನ್ನು ಓದಬಹುದಾಗಿದೆಯೇ ಎಂಬುದನ್ನು ಖಾತರಿ ಪಡಿಸಿಕೊಳ್ಳಿ." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "ಪ್ರವೇಶಪದ:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "ದಿನಾಂಕ/ಸಮಯ" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "ಬಳಕೆದಾರ" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "ಕ್ರಮ(ಕ್ರಿಯೆ)" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" "ಈ ವಸ್ತುವಿಗೆ ಬದಲಾವಣೆಯ ಇತಿಹಾಸವಿಲ್ಲ. ಅದು ಬಹುಶಃ ಈ ಆಡಳಿತತಾಣದ ಮೂಲಕ ಸೇರಿಸಲ್ಪಟ್ಟಿಲ್ಲ." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "ಎಲ್ಲವನ್ನೂ ತೋರಿಸು" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "ಉಳಿಸಿ" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "ಒಟ್ಟು %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "ಹೊಸದರಂತೆ ಉಳಿಸಿ" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "ಉಳಿಸಿ ಮತ್ತು ಇನ್ನೊಂದನ್ನು ಸೇರಿಸಿ" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "ಉಳಿಸಿ ಮತ್ತು ತಿದ್ದುವುದನ್ನು ಮುಂದುವರಿಸಿರಿ." -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"ಮೊದಲು ಬಳಕೆದಾರ-ಹೆಸರು ಮತ್ತು ಪ್ರವೇಶಪದವನ್ನು ಕೊಡಿರಿ. ನಂತರ, ನೀವು ಇನ್ನಷ್ಟು ಆಯ್ಕೆಗಳನ್ನು " -"ಬದಲಿಸಬಹುದಾಗಿದೆ." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "ಪ್ರವೇಶಪದ" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "ಪ್ರವೇಶಪದ(ಇನ್ನೊಮ್ಮೆ)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "ಖಚಿತಗೊಳಿಸಲು ಮೇಲಿನ ಪ್ರವೇಶಪದವನ್ನು ಇನ್ನೊಮ್ಮೆ ಬರೆಯಿರಿ." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "ತೆಗೆದು ಹಾಕಿ" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ಈದಿನ ತಮ್ಮ ಅತ್ಯಮೂಲ್ಯವಾದ ಸಮಯವನ್ನು ನಮ್ಮ ತಾಣದಲ್ಲಿ ಕಳೆದುದಕ್ಕಾಗಿ ಧನ್ಯವಾದಗಳು." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ಮತ್ತೆ ಒಳಬನ್ನಿ" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "ಪ್ರವೇಶಪದ ಬದಲಾವಣೆ ಯಶಸ್ವಿ" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "ನಿಮ್ಮ ಪ್ರವೇಶಪದ ಬದಲಾಯಿಸಲಾಗಿದೆ" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -708,138 +684,141 @@ "ಭದ್ರತೆಯ ದೃಷ್ಟಿಯಿಂದ ದಯವಿಟ್ಟು ನಿಮ್ಮ ಹಳೆಯ ಪ್ರವೇಶಪದವನ್ನು ಸೂಚಿಸಿರಿ. ಆನಂತರ ನೀವು ಸರಿಯಾಗಿ " "ಬರೆದಿದ್ದೀರೆಂದು ನಾವು ಖಚಿತಪಡಿಸಿಕೊಳ್ಳಲು ಹೊಸ ಪ್ರವೇಶಪದವನ್ನು ಎರಡು ಬಾರಿ ಬರೆಯಿರಿ." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "ಹಳೆಯ ಪ್ರವೇಶಪದ" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "ಹೊಸ ಪ್ರವೇಶಪದ" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "ನನ್ನ ಪ್ರವೇಶಪದ ಬದಲಿಸಿ" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "ಪ್ರವೇಶಪದವನ್ನು ಬದಲಿಸುವಿಕೆ" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "ಹೊಸ ಪ್ರವೇಶಪದ:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "ಪ್ರವೇಶಪದವನ್ನು ಖಚಿತಪಡಿಸಿ:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "ಪ್ರವೇಶಪದದ ಮರುನಿರ್ಧಾರ ಸಾಧ್ಯವಾಗಿದೆ" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "ನೀವು ಮರೆತಿದ್ದಲ್ಲಿ , ನಿಮ್ಮ ಬಳಕೆದಾರ-ಹೆಸರು" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "ನಮ್ಮ ತಾಣವನ್ನು ಬಳಸಿದ್ದಕ್ದಾಗಿ ಧನ್ಯವಾದಗಳು!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s ತಂಡ" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "ನನ್ನ ಪ್ರವೇಶಪದವನ್ನು ಮತ್ತೆ ನಿರ್ಧರಿಸಿ " -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "ಎಲ್ಲಾ ದಿನಾಂಕಗಳು" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s ಆಯ್ದುಕೊಳ್ಳಿ" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "ಬದಲಾಯಿಸಲು %s ಆಯ್ದುಕೊಳ್ಳಿ" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "ದಿನಾಂಕ:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "ಸಮಯ:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ko/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,13 +3,14 @@ # Translators: # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jeong Seongtae , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-10 10:46+0000\n" +"Last-Translator: Jeong Seongtae \n" "Language-Team: Korean (http://www.transifex.com/projects/p/django/language/" "ko/)\n" "MIME-Version: 1.0\n" @@ -18,71 +19,77 @@ "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "이용 가능한 %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" +"사용 가능한 %s 의 리스트 입니다. 아래의 상자에서 선택하고 두 상자 사이의 " +"\"선택\" 화살표를 클릭하여 몇 가지를 선택할 수 있습니다." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." -msgstr "" +msgstr "사용 가능한 %s 리스트를 필터링하려면 이 상자에 입력하세요." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "필터" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "모두 선택" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." -msgstr "" +msgstr "한번에 모든 %s 를 선택하려면 클릭하세요." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" -msgstr "" +msgstr "선택" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "삭제" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "선택된 %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" +"선택된 %s 리스트 입니다. 아래의 상자에서 선택하고 두 상자 사이의 \"제거\" 화" +"살표를 클릭하여 일부를 제거 할 수 있습니다." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" -msgstr "" +msgstr "모두 제거" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." -msgstr "" +msgstr "한번에 선택된 모든 %s 를 제거하려면 클릭하세요." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s개가 %(cnt)s개 중에 선택됨." -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -90,7 +97,8 @@ "개별 편집 가능한 필드에 저장되지 않은 값이 있습니다. 액션을 수행하면 저장되" "지 않은 값들을 잃어버리게 됩니다." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -99,7 +107,8 @@ "개별 필드의 값들을 저장하지 않고 액션을 선택했습니다. OK를 누르면 저장되며, " "액션을 한 번 더 실행해야 합니다." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -108,68 +117,82 @@ "개별 필드에 아무런 변경이 없는 상태로 액션을 선택했습니다. 저장 버튼이 아니" "라 진행 버튼을 찾아보세요." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "1월 2월 3월 4월 5월 6월 7월 8월 9월 10월 11월 12월" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "일 월 화 수 목 금 토" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "보기" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Note: 서버 시간보다 %s 시간 빠릅니다." -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "감추기" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Note: 서버 시간보다 %s 시간 늦은 시간입니다." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "현재" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "시계" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "시간 선택" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "자정" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "오전 6시" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "정오" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "취소" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "오늘" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "달력" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "어제" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "내일" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "1월 2월 3월 4월 5월 6월 7월 8월 9월 10월 11월 12월" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "일 월 화 수 목 금 토" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "보기" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "감추기" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ko/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ko/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ko/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ko/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ko/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,13 +3,14 @@ # Translators: # Jaehong Kim , 2011 # Jannis Leidel , 2011 +# Jeong Seongtae , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-10 11:05+0000\n" +"Last-Translator: Jeong Seongtae \n" "Language-Team: Korean (http://www.transifex.com/projects/p/django/language/" "ko/)\n" "MIME-Version: 1.0\n" @@ -18,193 +19,202 @@ "Language: ko\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "%(count)d개의 %(items)s (을)를 성공적으로 삭제하였습니다." +msgstr "%(count)d개의 %(items)s 을/를 성공적으로 삭제하였습니다." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s를 삭제할 수 없습니다." -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "확실합니까?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "선택된 %(verbose_name_plural)s (을)를 삭제합니다." +msgstr "선택된 %(verbose_name_plural)s 을/를 삭제합니다." -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "관리" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "모두" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "예" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "아니오" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "알 수 없습니다." -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "언제나" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "오늘" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "지난 7일" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "이번 달" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "이번 해" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"관리자 계정의 %(username)s 와 비밀번호를 입력해주세요. 대소문자를 구분해서 입" +"력해주세요." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "로그인 세션이 끊겼습니다. 다시 로그인 하세요." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "액션:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "액션 타임" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "오브젝트 아이디" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "오브젝트 표현" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "액션 플래그" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "메시지 변경" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "로그 엔트리" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "로그 엔트리" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." -msgstr "" +msgstr "\"%(object)s\"가 추가하였습니다." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" -msgstr "" +msgstr "\"%(object)s\" 를 %(changes)s 개 변경" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" -msgstr "" +msgstr "\"%(object)s.\"를 삭제하였습니다." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" -msgstr "" +msgstr "LogEntry 객체" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "없음" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." -msgstr "%s (이)가 변경되었습니다." +msgstr "%s 이/가 변경되었습니다." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "또한" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "%(name)s \"%(object)s\" (을)를 추가하였습니다." +msgstr "%(name)s \"%(object)s\" 을/를 추가하였습니다." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "%(list)s에 대한 %(name)s \"%(object)s\" (을)를 변경하였습니다." +msgstr "%(list)s에 대한 %(name)s \"%(object)s\" 을/를 변경하였습니다." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." -msgstr "%(name)s \"%(object)s\" (을)를 삭제하였습니다." +msgstr "%(name)s \"%(object)s\" 을/를 삭제하였습니다." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "변경된 필드가 없습니다." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." -msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다. 계속해서 편집하세요." +msgstr "%(name)s \"%(obj)s\" 이/가 추가되었습니다. 계속해서 편집하세요." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" +"%(name)s \"%(obj)s\" 이/가 추가되었습니다. 다른 %(name)s 을(를) 추가할 수 있" +"습니다." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "%(name)s \"%(obj)s\" (이)가 추가되었습니다." +msgstr "%(name)s \"%(obj)s\" 이/가 추가되었습니다." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." -msgstr "" +msgstr "%(name)s \"%(obj)s\" 이/가 변경되었습니다. 계속해서 편집하세요." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" +" %(name)s \"%(obj)s\" 이/가 변경되었습니다. 다른 %(name)s 을/를 추가할 수 있" +"습니다." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "%(name)s \"%(obj)s\" (이)가 변경되었습니다." +msgstr "%(name)s \"%(obj)s\" 이/가 변경되었습니다." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -212,304 +222,316 @@ "항목들에 액션을 적용하기 위해선 먼저 항목들이 선택되어 있어야 합니다. 아무 항" "목도 변경되지 않았습니다." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "액션이 선택되지 않았습니다." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s 추가" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\"이/가 삭제되었습니다." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "Primary key %(key)r에 대한 오브젝트 %(name)s(이)가 존재하지 않습니다." +msgstr "Primary key %(key)r에 대한 오브젝트 %(name)s이/가 존재하지 않습니다." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s 추가" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s 변경" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "데이터베이스 오류" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "%(count)s개의 %(name)s(이)가 변경되었습니다." +msgstr[0] "%(count)s개의 %(name)s이/가 변경되었습니다." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "모두 %(total_count)s개가 선택되었습니다." -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s 중 아무것도 선택되지 않았습니다." -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\"(이)가 삭제되었습니다." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "변경 히스토리: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"%(class_name)s %(instance)s 을/를 삭제하려면 다음 보호상태의 연관된 오브젝트" +"들을 삭제해야 합니다: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "로그인" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django 사이트 관리" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django 관리" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "사이트 관리" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s 사이트 관리" - -#: widgets.py:90 -msgid "Date:" -msgstr "날짜:" - -#: widgets.py:91 -msgid "Time:" -msgstr "시각:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "찾아보기" - -#: widgets.py:260 -msgid "Add Another" -msgstr "하나 더 추가하기" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "로그인" -#: widgets.py:303 -msgid "Change:" -msgstr "" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s 관리" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "해당 페이지가 없습니다." -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "죄송합니다, 요청하신 페이지를 찾을 수 없습니다." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "홈" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "서버 오류" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "서버 오류 (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "서버 오류 (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" +"오류가 있었습니다. 사이트 관리자에게 이메일로 보고 되었고, 곧 수정될 것입니" +"다. 이해해주셔서 고맙습니다." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "선택한 액션을 실행합니다." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "실행" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "모든 페이지의 항목들을 선택하려면 여기를 클릭하세요." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "%(total_count)s개의 %(module_name)s 모두를 선택합니다." -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "선택을 해제합니다." -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"사용자명와 비밀번호를 입력하세요.더 많은 사용자 옵션을 사용하실 수 있습니다." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "유저명과 암호를 입력하세요." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "비밀번호 변경" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "아래의 오류를 수정하십시오." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "아래의 오류를 수정하십시오." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s 새로운 비밀번호를 입력하세요." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "비밀번호" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "비밀번호 (확인)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. " -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "환영합니다," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "문서" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "비밀번호 변경" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "로그아웃" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django 사이트 관리" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django 관리" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "추가" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "히스토리" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "사이트에서 보기" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "아래의 오류를 수정하십시오." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s 추가" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "필터" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" -msgstr "" +msgstr "정렬에서 " -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" -msgstr "" +msgstr "정렬 조건 : %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" -msgstr "" +msgstr "정렬 " -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "삭제" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"%(object_name)s \"%(escaped_object)s\" (을)를 삭제하면서관련 오브젝트를 제거" -"하고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없" -"습니다. :" +"%(object_name)s \"%(escaped_object)s\" 을/를 삭제하면서관련 오브젝트를 제거하" +"고자 했으나, 지금 사용하시는 계정은 다음 타입의 오브젝트를 제거할 권한이 없습" +"니다. :" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"%(object_name)s '%(escaped_object)s'를 삭제하려면 다음 보호상태의 연관 오브젝" -"트를 삭제해야 합니다." +"%(object_name)s '%(escaped_object)s'를 삭제하려면 다음 보호상태의 연관된 오브" +"젝트들을 삭제해야 합니다." -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"정말로 %(object_name)s \"%(escaped_object)s\"(을)를 삭제하시겠습니까? 다음의 " +"정말로 %(object_name)s \"%(escaped_object)s\"을/를 삭제하시겠습니까? 다음의 " "관련 항목들이 모두 삭제됩니다. :" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "네, 확실합니다." -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "여러 개의 오브젝트 삭제" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -519,15 +541,16 @@ "연관 오브젝트 삭제로 선택한 %(objects_name)s의 삭제 중, 그러나 당신의 계정은 " "다음 오브젝트의 삭제 권한이 없습니다. " -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -"%(objects_name)s를 삭제하려면 다음 보호상태의 오브젝트를 삭제해야 합니다." +"%(objects_name)s를 삭제하려면 다음 보호상태의 연관된 오브젝트들을 삭제해야 합" +"니다." -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -536,41 +559,56 @@ "선택한 %(objects_name)s를 정말 삭제하시겠습니까? 다음의 오브젝트와 연관 아이" "템들이 모두 삭제됩니다:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "삭제하기" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "%(verbose_name)s 더 추가하기" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "삭제" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s (으)로" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" -msgstr "" +msgstr "%(name)s 애플리케이션의 " -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "변경" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "수정할 권한이 없습니다." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "최근 액션" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "나의 액션" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "이용할 수 없습니다." -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "내용 형식이 지정되지 않았습니다." -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -579,27 +617,27 @@ "데이터베이스 설정에 문제가 발생했습니다. 해당 데이터베이스 테이블이 생성되었" "는지, 해당 유저가 데이터베이스를 읽어 들일 수 있는지 확인하세요." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "비밀번호" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" -msgstr "" +msgstr "이름이나 비밀번호를 분실하였습니까?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "날짜/시간" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "사용자" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "액션" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -607,110 +645,60 @@ "오브젝트에 변경사항이 없습니다. 이 admin 사이트를 통해 추가된 것이 아닐 수 있" "습니다." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "모두 표시" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "저장" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "검색" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "결과 %(counter)s개 나옴" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "총 %(full_result_count)s건" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "새로 저장" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "저장 및 다른 이름으로 추가" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "저장 및 편집 계속" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"사용자명와 비밀번호를 입력하세요.더 많은 사용자 옵션을 사용하실 수 있습니다." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "유저명과 암호를 입력하세요." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s 새로운 비밀번호를 입력하세요." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "비밀번호" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "비밀번호 (확인)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "확인을 위해 위와 동일한 비밀번호를 입력하세요. " - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "삭제하기" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "%(verbose_name)s 더 추가하기" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "삭제" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "사이트를 이용해 주셔서 고맙습니다." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "다시 로그인하기" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "비밀번호 변경" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "비밀번호를 변경하였습니다." - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "비밀번호가 변경되었습니다." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -718,46 +706,34 @@ "보안상 필요하오니 기존에 사용하시던 비밀번호를 입력해 주세요. 새로운 비밀번호" "는 정확히 입력했는지 확인할 수 있도록 두 번 입력하시기 바랍니다." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "기존 비밀번호:" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "새 비밀번호:" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "비밀번호 변경" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "비밀번호 초기화" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "비밀번호가 초기화 완료" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "비밀번호가 설정되었습니다. 이제 로그인하세요." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "비밀번호 초기화 확인" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "새 비밀번호 입력" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -765,19 +741,15 @@ "새로운 비밀번호를 정확히 입력했는지 확인할 수 있도록두 번 입력하시기 바랍니" "다." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "새로운 비밀번호:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "새로운 비밀번호(확인):" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "비밀번호가 초기화를 실패하였습니다." - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -785,75 +757,100 @@ "비밀번호 초기화 링크가 이미 사용되어 올바르지 않습니다.비밀번호 초기화을 다" "시 해주세요." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "비밀번호가 초기화되었습니다." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"당신의 비밀번호를 지정하기위한 지침을 메일로 보냈습니다. 곧 메일을 받으실 것" +"입니다." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"만약 이메일을 받지 못하였다면, 등록하신 이메일을 다시 확인하시거나 스팸 메일" +"함을 확인해주세요." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." -msgstr "" +msgstr "%(site_name)s 의 사용자" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "이어지는 페이지에서 새 비밀번호를 선택하세요." -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "사용자명:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "사이트를 이용해 주셔서 고맙습니다." -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s 팀" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"비밀번호를 분실하셨습니까? 아래에 이메일 주소를 입력해주십시오. 새로운 비밀번" +"호를 설정하는 이메일을 보내드리겠습니다." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "" +msgstr "이메일 주소" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "비밀번호 초기화" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "언제나" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(없음)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s 선택" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "변경할 %s 선택" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "날짜:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "시각:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "찾아보기" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "하나 더 추가하기" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "현재:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "변경:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/lb/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,10 +3,10 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:35+0100\n" -"PO-Revision-Date: 2011-01-19 15:01+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2013-04-25 07:59+0000\n" "Last-Translator: Django team\n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/django/" "language/lb/)\n" @@ -16,153 +16,173 @@ "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:26 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:27 -msgid "S M T W T F S" -msgstr "" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:49 -#: static/admin/js/admin/DateTimeShortcuts.js:85 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:53 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:81 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:86 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:87 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:92 -#: static/admin/js/admin/DateTimeShortcuts.js:204 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:144 -#: static/admin/js/admin/DateTimeShortcuts.js:197 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:148 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:195 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/lb/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/lb/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/lb/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/lb/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/lb/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/lb/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # sim0n , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-03 23:27+0000\n" -"Last-Translator: sim0n \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Luxembourgish (http://www.transifex.com/projects/p/django/" "language/lb/)\n" "MIME-Version: 1.0\n" @@ -17,460 +17,470 @@ "Language: lb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "All" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Jo" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nee" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Onbekannt" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Iergendeen Datum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Haut" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Läscht 7 Deeg" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Dëse Mount" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Dëst Joer" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Aktioun:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "" - -#: sites.py:386 -msgid "Site administration" -msgstr "" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "" - -#: widgets.py:91 -msgid "Time:" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" msgstr "" -#: widgets.py:165 -msgid "Lookup" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" msgstr "" -#: widgets.py:260 -msgid "Add Another" +#: contrib/admin/sites.py:42 +msgid "Site administration" msgstr "" -#: widgets.py:302 -msgid "Currently:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" msgstr "" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 -#, python-format -msgid "%(name)s" +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." msgstr "" -#: templates/admin/base.html:28 -msgid "Welcome," +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." msgstr "" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Documentation" +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" msgstr "" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." msgstr "" -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Log out" +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." msgstr "" -#: templates/admin/base_site.html:4 -msgid "Django site admin" +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." msgstr "" -#: templates/admin/base_site.html:7 -msgid "Django administration" +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" msgstr "" -#: templates/admin/change_form.html:22 templates/admin/index.html:33 -msgid "Add" +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" msgstr "" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 -msgid "History" +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." msgstr "" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 -msgid "View on site" +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" msgstr "" -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Läschen" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -478,30 +488,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -509,328 +519,297 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Änner" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/lt/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,11 +7,11 @@ # Simonas Kazlauskas , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/" "language/lt/)\n" "MIME-Version: 1.0\n" @@ -21,12 +21,12 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Galimi %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -36,38 +36,38 @@ "paspausdami „Pasirinkti“ rodyklę tarp dviejų dėžučių jūs galite pasirinkti " "keletą iš jų." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Rašykite į šią dėžutę, kad išfiltruotumėte prieinamų %s sąrašą." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtras" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Pasirinkti visus" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Spustelėkite, kad iš karto pasirinktumėte visus %s." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Pasirinkti" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Pašalinti" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Pasirinktas %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -77,30 +77,33 @@ "paspausdami „Pašalinti“ rodyklę tarp dviejų dėžučių jūs galite pašalinti " "keletą iš jų." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Pašalinti visus" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Spustelėkite, kad iš karto pašalintumėte visus pasirinktus %s." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "pasirinktas %(sel)s iš %(cnt)s" msgstr[1] "pasirinkti %(sel)s iš %(cnt)s" msgstr[2] "pasirinkti %(sel)s iš %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" "Turite neišsaugotų pakeitimų. Jeigu tęsite, Jūsų pakeitimai bus prarasti." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -109,7 +112,8 @@ "Pasirinkote veiksmą, bet dar neesate išsaugoję pakeitimų. Nuspauskite Gerai " "norėdami išsaugoti. Jus reikės iš naujo paleisti veiksmą." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -118,70 +122,88 @@ "Pasirinkote veiksmą, bet neesate pakeitę laukų reikšmių. Jūs greičiausiai " "ieškote mygtuko Vykdyti, o ne mygtuko Saugoti." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Sausis Vasaris Kovas Balandis Gegužė Birželis Liepa Rugpjūtis Rugsėjis " -"Spalis Lapkritis Gruodis" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S Pr A T K Pn Š" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Parodyti" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Slėpti" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Dabar" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Laikrodis" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Pasirinkite laiką" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Vidurnaktis" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Vidurdienis" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Atšaukti" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Šiandien" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendorius" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Vakar" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Rytoj" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Sausis Vasaris Kovas Balandis Gegužė Birželis Liepa Rugpjūtis Rugsėjis " +"Spalis Lapkritis Gruodis" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S Pr A T K Pn Š" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Parodyti" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Slėpti" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/lt/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/lt/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/lt/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/lt/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/lt/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,14 +5,14 @@ # lauris , 2011 # Nikolajus Krauklis , 2013 # Simonas Kazlauskas , 2012-2013 -# Mantas Zimnickas , 2011 +# sirex , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-23 16:01+0000\n" -"Last-Translator: Simonas Kazlauskas \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 17:04+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Lithuanian (http://www.transifex.com/projects/p/django/" "language/lt/)\n" "MIME-Version: 1.0\n" @@ -22,62 +22,68 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n" "%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Sėkmingai ištrinta %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ištrinti %(name)s negalima" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ar esate tikras?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Ištrinti pasirinktus %(verbose_name_plural)s " -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Visi" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Taip" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nežinomas" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Betkokia data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Šiandien" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Paskutinės 7 dienos" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Šį mėnesį" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Šiais metais" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -86,101 +92,98 @@ "Prašome įvesti tinkamą personalo paskyros %(username)s ir slaptažodį. " "Atminkite, kad abu laukeliai yra jautrūs raidžių dydžiui." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Prisijunkite dar kartą, nes sesijos laikas baigėsi." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Veiksmas:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "veiksmo laikas" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekto id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekto repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "veiksmo žymė" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "pakeisti žinutę" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "log įrašas" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "log įrašai" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "„%(object)s“ pridėti." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Pakeisti „%(object)s“ - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "„%(object)s“ ištrinti." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry objektas" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "None" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Pakeistas %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ir" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Įrašyta %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Pakeistas %(list)s šiam %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Pašalinta %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nei vienas laukas nepakeistas" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" pridėtas sėkmingai. Gali taisytį jį dar kartą žemiau." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +192,12 @@ "%(name)s \"%(obj)s\" buvo sėkmingai pridėtas. Jūs galite pridėti naują " "%(name)s žemiau." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" pridėtas sėkmingai." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -203,7 +206,7 @@ "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas. Jūs galite jį koreguoti " "žemiau." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -212,12 +215,12 @@ "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas. Jūs galite pridėti naują " "%(name)s žemiau." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" buvo sėkmingai pakeistas." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -225,30 +228,35 @@ "Įrašai turi būti pasirinkti, kad būtų galima atlikti veiksmus. Įrašai " "pakeisti nebuvo." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Veiksmai atlikti nebuvo." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Pridėti %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" sėkmingai ištrintas." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Įrašas %(name)s su pirminiu raktu %(key)r neegzistuoja." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Pridėti %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Pakeisti %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Duomenų bazės klaida" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -256,7 +264,7 @@ msgstr[1] "%(count)s %(name)s sėkmingai pakeisti." msgstr[2] "%(count)s %(name)s " -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -264,114 +272,95 @@ msgstr[1] "%(total_count)s pasirinkti" msgstr[2] "Visi %(total_count)s pasirinkti" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 iš %(cnt)s pasirinkta" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" sėkmingai ištrintas." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Pakeisti istoriją: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Prieš pašalinant %(object_name)s '%(escaped_object)s' būtina pašalinti šiuos " -"apsaugotus susijusius objektus:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Prisijungti" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django saito administravimas" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administravimas" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Saito administravimas" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administravimas" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Laikas:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Paieška" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Pridėti dar viena" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Šiuo metu:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Prisijungti" -#: widgets.py:303 -msgid "Change:" -msgstr "Pakeisti:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Puslapis nerastas" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Atsiprašome, bet prašytas puslapis nerastas." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Pradinis" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serverio klaida" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serverio klaida (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serverio klaida (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -379,120 +368,141 @@ "Netikėta klaida. Apie ją buvo pranešta administratoriams el. paštu ir ji " "turėtų būti greitai sutvarkyta. Dėkui už kantrybę." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Vykdyti pasirinktus veiksmus" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Vykdyti" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Spauskite čia norėdami pasirinkti visus įrašus" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Pasirinkti visus %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Atstatyti į pradinę būseną" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Pirmiausia įveskite naudotojo vardą ir slaptažodį. Tada galėsite keisti " +"daugiau naudotojo nustatymų." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Įveskite naudotojo vardą ir slaptažodį." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Keisti slaptažodį" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Ištaisykite žemiau esancias klaidas." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Ištaisykite žemiau esančias klaidas." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Įveskite naują slaptažodį naudotojui %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Slaptažodis" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Slaptažodis (dar kartą)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Sveiki," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentacija" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Keisti slaptažodį" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Atsijungti" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django saito administravimas" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administravimas" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Pridėti" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Istorija" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Matyti saite" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Ištaisykite žemiau esancias klaidas." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Ištaisykite žemiau esančias klaidas." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Naujas %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtras" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Pašalinti iš rikiavimo" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Rikiavimo prioritetas: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Perjungti rikiavimą" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Ištrinti" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -502,7 +512,7 @@ "Trinant %(object_name)s '%(escaped_object)s' turi būti ištrinti ir susiję " "objektai, bet tavo vartotojas neturi teisių ištrinti šių objektų:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -511,7 +521,7 @@ "Ištrinant %(object_name)s '%(escaped_object)s' būtų ištrinti šie apsaugoti " "ir susiję objektai:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -520,16 +530,16 @@ "Ar tu esi tikras, kad nori ištrinti %(object_name)s \"%(escaped_object)s\"? " "Visi susiję objektai bus ištrinti:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Taip, esu tikras" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Ištrinti kelis objektus" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -539,7 +549,7 @@ "Ištrinant pasirinktą %(objects_name)s būtų ištrinti susiję objektai, tačiau " "jūsų vartotojas neturi reikalingų teisių ištrinti šiuos objektų tipus:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -548,7 +558,7 @@ "Ištrinant pasirinktus %(objects_name)s būtų ištrinti šie apsaugoti ir susiję " "objektai:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -557,41 +567,56 @@ "Ar esate tikri, kad norite ištrinti pasirinktus %(objects_name)s? Sekantys " "pasirinkti bei susiję objektai bus ištrinti:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Pašalinti" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Pridėti dar viena %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Ištrinti?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Pagal %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s aplikacijos modeliai" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Pakeisti" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Neturite teisių ką nors keistis." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Paskutiniai Veiksmai" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mano Veiksmai" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nėra prieinamų" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Nežinomas turinys" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -601,27 +626,27 @@ "reikalingos lentelės sukurtos ir vartotojas turi teises skaityti duomenų " "bazę." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Slaptažodis:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Pamiršote slaptažodį ar vartotojo vardą?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/laikas" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Naudotojas" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Veiksmas" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -629,19 +654,20 @@ "Šis objektas neturi pakeitimų istorijos. Tikriausiai jis buvo pridėtas ne " "per admin puslapį." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Rodyti visus" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Išsaugoti" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Ieškoti" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -649,93 +675,41 @@ msgstr[1] "%(counter)s rezultatai" msgstr[2] "%(counter)s rezultatai" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s iš viso" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Išsaugoti kaip naują" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Išsaugoti ir pridėti naują" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Išsaugoti ir tęsti redagavimą" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Pirmiausia įveskite naudotojo vardą ir slaptažodį. Tada galėsite keisti " -"daugiau naudotojo nustatymų." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Įveskite naudotojo vardą ir slaptažodį." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Įveskite naują slaptažodį naudotojui %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Slaptažodis" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Slaptažodis (dar kartą)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Patikrinimui įvesk tokį patį slaptažodį, kaip viršuje." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Pašalinti" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Pridėti dar viena %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Ištrinti?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Dėkui už praleistą laiką šiandien." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Prisijungti dar kartą" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Slaptažodžio keitimas" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Slaptažodis sėkmingai pakeistas" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Jūsų slaptažodis buvo pakeistas." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -743,46 +717,34 @@ "Saugumo sumetimais įvesk seną slaptažodį ir tada du kartus naują, kad " "įsitikinti, jog nesuklydai rašydamas" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Senas slaptažodis" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Naujas " -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Keisti mano slaptažodį" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Slaptažodžio atstatymas" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Slaptažodžio atstatymas baigtas" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Jūsų slaptažodis buvo išsaugotas. Dabas galite prisijungti." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Slaptažodžio atstatymo patvirtinimas" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Įveskite naują slaptažodį" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -790,19 +752,15 @@ "Įveskite naująjį slaptažodį du kartus, taip užtikrinant, jog nesuklydote " "rašydami." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Naujasis slaptažodis:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Slaptažodžio patvirtinimas:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Slaptažodžio atstatymas nesėkmingas" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -810,12 +768,7 @@ "Slaptažodžio atstatymo nuoroda buvo negaliojanti, nes ja tikriausiai jau " "buvo panaudota. Prašykite naujo slaptažodžio pakeitimo." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Slaptažodis sėkmingai atstatytas" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -823,7 +776,7 @@ "Instrukcijos kaip nustatyti slaptažodį buvo išsiųstos jūsų nurodytų el. " "pašto adresu. Instrukcijas turėtumėte gauti netrukus." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -831,7 +784,7 @@ "Jei el. laiško negavote, prašome įsitikinti ar įvedėte tą el. pašto adresą " "kuriuo registravotės ir patikrinkite savo šlamšto aplanką." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -840,24 +793,24 @@ "Jūs gaunate šį laišką nes prašėte paskyros slaptažodžio atkūrimo " "%(site_name)s svetainėje." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Prašome eiti į šį puslapį ir pasirinkti naują slaptažodį:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Jūsų naudotojo vardas, jei netyčia jį užmiršote:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Dėkui, kad naudojatės mūsų saitu!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s komanda" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -865,28 +818,52 @@ "Pamiršote slaptažodį? Įveskite savo el. pašto adresą ir mes išsiųsime laišką " "su instrukcijomis kaip nustatyti naują slaptažodį." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "El. pašto adresas:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Atstatyti slaptažodį" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Visos datos" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "()" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Pasirinkti %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Pasirinkite %s kurį norite keisti" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Laikas:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Paieška" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Pridėti dar viena" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Šiuo metu:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Pakeisti:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/lv/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/" "lv/)\n" "MIME-Version: 1.0\n" @@ -18,73 +18,75 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Pieejams %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtrs" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Izvēlēties visu" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Izņemt" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Izvēlies %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s no %(cnt)s izvēlēts" msgstr[1] "%(sel)s no %(cnt)s izvēlēti" msgstr[2] "%(sel)s no %(cnt)s izvēlēti" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -92,7 +94,8 @@ "Jūs neesat saglabājis izmaiņas rediģējamiem laukiem. Ja jūs tagad " "izpildīsiet izvēlēto darbību, šīs izmaiņas netiks saglabātas." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -101,7 +104,8 @@ "Jūs esat izvēlējies veikt darbību un neesat saglabājis veiktās izmaiņas. " "Lūdzu nospiežat OK, lai saglabātu. Jums nāksies šo darbību izpildīt vēlreiz." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -110,70 +114,88 @@ "Jūs esat izvēlējies veikt darbību un neesat izmainījis nevienu lauku. Jūs " "droši vien meklējat pogu 'Aiziet' nevis 'Saglabāt'." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Janvāris Februāris Marts Aprīlis Maijs Jūnijs Jūlijs Augusts Septembris " -"Oktobris Novembris Decembris" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S P O T C P S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Parādīt" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Slēpt" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Tagad" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Pulkstens" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Izvēlieties laiku" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Pusnakts" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "06.00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Pusdienas laiks" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Atcelt" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Šodien" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendārs" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Vakar" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Rīt" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Janvāris Februāris Marts Aprīlis Maijs Jūnijs Jūlijs Augusts Septembris " +"Oktobris Novembris Decembris" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S P O T C P S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Parādīt" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Slēpt" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/lv/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/lv/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/lv/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/lv/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/lv/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Latvian (http://www.transifex.com/projects/p/django/language/" "lv/)\n" @@ -19,222 +19,230 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : " "2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Veiksmīgi izdzēsti %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Vai esat pārliecināts?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izdzēst izvēlēto %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Visi" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Jā" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nē" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nezināms" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Jebkurš datums" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Šodien" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Pēdējās 7 dienas" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Šomēnes" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Šogad" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Lūdzu pieslēdzieties vēlreiz, jūsu sesija ir beigusies." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Darbība:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "darbības laiks" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekta id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekta attēlojums" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "darbības atzīme" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "izmaiņas teksts" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "žurnāla ieraksts" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "žurnāla ieraksti" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "nekas" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Izmainīts %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "un" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Pievienots %(name)s \"%(object)s\"" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Izmainīts %(list)s priekš %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Dzēsts %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Lauki nav izmainīti" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi. Zemāk varat to labot." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" pievienots sekmīgi." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" nomainīts sekmīgi." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "Lai veiktu darbību, jāizvēlas rindas. Rindas nav izmainītas." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nav izvēlēta darbība." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Pievienot %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" sekmīgi izdzēsts." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s objekts ar primāro atslēgu %(key)r neeksistē." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Pievienot %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Labot %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Datubāzes kļūda" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -242,7 +250,7 @@ msgstr[1] "%(count)s %(name)s ir sekmīgi rediģēts" msgstr[2] "%(count)s %(name)s ir sekmīgi rediģēti." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -250,231 +258,235 @@ msgstr[1] "%(total_count)s izvēlēts" msgstr[2] "%(total_count)s izvēlēti" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 no %(cnt)s izvēlēti" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" sekmīgi izdzēsts." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Izmaiņu vēsture: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Pieslēgties" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administrācijas lapa" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administrācija" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Lapas administrācija" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s administrācija" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datums:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Laiks:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Pārlūkot" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Pievienot vēl vienu" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Pieslēgties" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Lapa nav atrasta" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Atvainojiet, pieprasītā lapa neeksistē." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Sākums" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Servera kļūda" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Servera kļūda (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Servera kļūda (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Izpildīt izvēlēto darbību" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Aiziet!" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Spiest šeit, lai iezīmētu objektus no visām lapām" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Izvēlēties visus %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Atcelt iezīmēto" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Vispirms ievadiet lietotāja vārdu un paroli. Tad varēsiet labot pārējos " +"lietotāja uzstādījumus." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Paroles maiņa" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Lūdzu, izlabojiet kļūdas zemāk." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Ievadiet jaunu paroli lietotājam %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Parole" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Parole (vēlreiz)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Sveicināti," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentācija" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Paroles maiņa" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Atslēgties" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administrācijas lapa" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administrācija" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Pievienot" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Vēsture" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Apskatīt lapā" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Lūdzu, izlabojiet kļūdas zemāk." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Pievienot %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrs" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Dzēst" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -484,14 +496,14 @@ "Izdzēšot objektu %(object_name)s '%(escaped_object)s', tiks dzēsti visi " "saistītie objekti, bet jums nav tiesību dzēst sekojošus objektu tipus:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -500,16 +512,16 @@ "Vai esat pārliecināts, ka vēlaties dzēst %(object_name)s \"%(escaped_object)s" "\"? Tiks dzēsti arī sekojoši saistītie objekti:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Jā, esmu pārliecināts" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Dzēst vairākus objektus" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -517,55 +529,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Dzēst" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Pievienot vēl %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Dzēst?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Pēc %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Izmainīt" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Jums nav tiesības neko labot." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Nesenās darbības" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Manas darbības" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nav pieejams" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Nezināms saturs" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -574,27 +601,27 @@ "Problēma ar datubāzes instalāciju. Pārliecinieties, ka attiecīgās tabulas ir " "izveidotas un attiecīgajam lietotājam ir tiesības tai piekļūt." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Parole:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datums/laiks" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Lietotājs" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Darbība" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -602,19 +629,20 @@ "Šim objektam nav izmaiņu vēstures. Tas visdrīzāk netika pievienots, " "izmantojot šo administrācijas rīku." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Rādīt visu" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Saglabāt" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Meklēt" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -622,93 +650,41 @@ msgstr[1] "" msgstr[2] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "kopā - %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Saglabāt kā jaunu" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Saglabāt un pievienot vēl vienu" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Saglabāt un turpināt labošanu" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Vispirms ievadiet lietotāja vārdu un paroli. Tad varēsiet labot pārējos " -"lietotāja uzstādījumus." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Ievadiet jaunu paroli lietotājam %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Parole" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Parole (vēlreiz)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Pārbaudei atkārtoti ievadiet to pašu paroli kā augstāk." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Dzēst" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Pievienot vēl %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Dzēst?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Paldies par pavadīto laiku mājas lapā." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Pieslēgties vēlreiz" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Paroles maiņa" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Paroles nomaiņa sekmīga" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Jūsu parole tika nomainīta." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -716,46 +692,34 @@ "Drošības nolūkos ievadiet veco paroli un pēc tam ievadiet jauno paroli " "divreiz, lai varētu pārbaudīt, ka tā ir uzrakstīta pareizi." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Vecā parole" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Jaunā parole" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Nomainīt manu paroli" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Paroles pārstatīšana(reset)" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Paroles pārstatīšana pabeigta" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Jūsu parole ir uzstādīta. Varat pieslēgties." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Paroles pārstatīšanas apstiprinājums" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Ievadiet jauno paroli" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -763,19 +727,15 @@ "Lūdzu ievadiet jauno paroli divreiz, lai varētu pārbaudīt, ka tā ir " "uzrakstīta pareizi." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Jaunā parole:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Apstiprināt paroli:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Paroles pārstatīšana nesekmīga" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -783,75 +743,94 @@ "Paroles pārstatīšanas saite bija nekorekta, iespējams, tā jau ir izmantota. " "Lūdzu pieprasiet paroles pārstatīšanu vēlreiz." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Paroles pārstatīšana sekmīga" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Lūdzu apmeklējiet sekojošo lapu un ievadiet jaunu paroli:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Jūsu lietotājvārds, ja gadījumā tas ir aizmirsts:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Paldies par mūsu lapas lietošanu!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s komanda" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Paroles pārstatīšana" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Visi datumi" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Izvēlēties %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Izvēlēties %s, lai izmainītu" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datums:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Laiks:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Pārlūkot" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Pievienot vēl vienu" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/mk/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,15 @@ # # Translators: # Jannis Leidel , 2011 +# vvangelovski , 2014 # vvangelovski , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-13 23:07+0000\n" +"Last-Translator: vvangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/django/" "language/mk/)\n" "MIME-Version: 1.0\n" @@ -18,12 +19,12 @@ "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Достапно %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +33,38 @@ "Ова е листа на достапни %s. Можете да изберете неколку кликајќи на нив во " "полето подолу и со кликање на стрелката \"Одбери\" помеѓу двете полиња." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Пишувајте во ова поле за да ја филтрирате листата на достапни %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Филтер" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Избери ги сите" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Кликнете за да ги изберете сите %s од еднаш." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Изберете" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Отстрани" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Избрано %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,22 +73,24 @@ "Ова е листа на избрани %s. Можете да отстраните неколку кликајќи на нив во " "полето подолу и со кликање на стрелката \"Отстрани\" помеѓу двете полиња." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Отстрани ги сите" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Кликнете за да ги отстраните сите одбрани %s одеднаш." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "избрано %(sel)s од %(cnt)s" msgstr[1] "избрани %(sel)s од %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -95,7 +98,8 @@ "Имате незачувани промени на поединечни полиња. Ако извршите акција вашите " "незачувани промени ќе бидат изгубени." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +109,8 @@ "полиња. Кликнете ОК за да ги зачувате. Ќе треба повторно да ја извршите " "акцијата." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +119,86 @@ "Избравте акција и немате направено промени на поединечни полиња. Веројатно " "го барате копчето Оди наместо Зачувај." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Јануари Февруари Март Април Мај Јуни Јули Август Септември Октомври Ноември " -"Декември" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Н П В С Ч П С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Прикажи" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Сокриј" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Забелешка: Вие сте %s час понапред од времето на серверот." +msgstr[1] "Забелешка: Вие сте %s часа понапред од времето на серверот." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Забелешка: Вие сте %s час поназад од времето на серверот." +msgstr[1] "Забелешка: Вие сте %s часа поназад од времето на серверот." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Сега" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Часовник" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Избери време" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Полноќ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 наутро" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Пладне" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Откажи" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Денеска" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Календар" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Вчера" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Утре" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Јануари Февруари Март Април Мај Јуни Јули Август Септември Октомври Ноември " +"Декември" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Н П В С Ч П С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Прикажи" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Сокриј" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/mk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/mk/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/mk/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/mk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/mk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,14 @@ # # Translators: # Jannis Leidel , 2011 -# vvangelovski , 2013 +# vvangelovski , 2013-2014 # vvangelovski , 2011-2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-09-23 10:59+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 21:54+0000\n" "Last-Translator: vvangelovski \n" "Language-Team: Macedonian (http://www.transifex.com/projects/p/django/" "language/mk/)\n" @@ -19,158 +19,161 @@ "Language: mk\n" "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно беа избришани %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Не може да се избрише %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Сигурни сте?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Избриши ги избраните %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Администрација" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Сите" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Да" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Не" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Непознато" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Било кој датум" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Денеска" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Последните 7 дена" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Овој месец" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Оваа година" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Ве молиме внесете ги точните %(username)s и лозинка за член. Внимавајте, " -"двете полиња се осетливи на големи и мали букви." +"Ве молиме внесете ги точните %(username)s и лозинка за член на сајтот. " +"Внимавајте, двете полиња се осетливи на големи и мали букви." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Ве молам најавете се повторно бидејќи вашата сесија е истечена." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Акција:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "време на акција" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "идентификационен број на објект" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "репрезентација на објект" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "знакче за акција" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "измени ја пораката" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ставка во записникот" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "ставки во записникот" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Додадено \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Променето \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Избришано \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Запис во дневник" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ништо" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Изменета %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "и" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Додадено %(name)s „%(object)s“." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Изменето %(list)s за %(name)s „%(object)s“." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." -msgstr "Избришан %(name)s „%(object)s“." +msgstr "Избришано %(name)s „%(object)s“." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." -msgstr "Не беше изменето ниедно поле." +msgstr "Не е изменето ниедно поле." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -178,7 +181,7 @@ "Ставката %(name)s \"%(obj)s\" беше успешно додадена. Подолу можете повторно " "да ја уредите." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +190,12 @@ "Ставката %(name)s \"%(obj)s\" беше успешно додаден. Можете да додадете нов " "%(name)s подолу." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Ставката %(name)s \"%(obj)s\" беше успешно додадена." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ "Ставката %(name)s \"%(obj)s\" беше успешно уредена. Подолу можете повторно " "да ја уредите." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "Ставката %(name)s \"%(obj)s\" беше успешно уредена. Подолу можете да " "додадете нов %(name)s." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" беше успешно изменета." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,151 +226,139 @@ "Мора да се одберат предмети за да се изврши акција врз нив. Ниеден предмет " "не беше променет." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ниедна акција не е одбрана." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Додади %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "објект %(name)s со примарен клуч %(key)r не постои." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Додади %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Измени %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Грешка во базата на податоци" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s ставка %(name)s беше успешно изменета." msgstr[1] "%(count)s ставки %(name)s беа успешно изменети." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s одбран" msgstr[1] "Сите %(total_count)s одбрани" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 од %(cnt)s избрани" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Ставаката %(name)s \"%(obj)s\" беше избришана успешно." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Историја на измени: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Бришење на %(object_name)s '%(escaped_object)s' ќе резултира со бришење на " -"следниве заштитени објекти:" +"Бришењето на %(class_name)s %(instance)s бара бришење на следните заштитени " +"поврзани објекти: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Најава" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Џанго администрација на сајт" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Џанго администрација" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Администрација на сајт" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s администрација" - -#: widgets.py:90 -msgid "Date:" -msgstr "Датум:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Време:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Побарај" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Додади друго" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Моментално:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Најава" -#: widgets.py:303 -msgid "Change:" -msgstr "Измени:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Администрација на %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Страницата не е најдена" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Се извинуваме, но неможе да ја најдеме страницата која ја баравте." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Дома" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Грешка со серверот" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Грешка со серверот (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Грешка со серверот (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -375,120 +366,141 @@ "Имаше грешка. Администраторите на сајтот се известени и треба да биде брзо " "поправена. Ви благодариме за вашето трпение." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Изврши ја избраната акција" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Оди" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Кликнете тука за да изберете објекти низ повеќе страници" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Избери ги сите %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Откажи го изборот" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Прво, внесете корисничко име и лозинка. Потоа ќе можете да уредувате повеќе " +"кориснички опции." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Внесете корисничко име и лозинка." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Промени лозинка" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Ве молам поправете ги грешките подолу." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Ве молам поправете ги грешките подолу." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Внесете нова лозинка за корисникот %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Лозинка" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Лозинка (повторно)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Заради верификација внесете ја истата лозинка како и горе." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Добредојдовте," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документација" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Промени лозинка" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Одјава" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Џанго администрација на сајт" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Џанго администрација" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Додади" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Историја" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Погледни на сајтот" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Ве молам поправете ги грешките подолу." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Ве молам поправете ги грешките подолу." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Додади %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Филтер" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Отстрани од сортирање" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Приоритет на сортирање: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Вклучи/исклучи сортирање" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Избриши" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -499,7 +511,7 @@ "поврзаните објекти, но со вашата сметка немате доволно привилегии да ги " "бришете следните типови на објекти:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -508,7 +520,7 @@ "Бришење на %(object_name)s '%(escaped_object)s' ќе резултира со бришење на " "следниве заштитени објекти:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -517,16 +529,16 @@ "Сигурне сте дека сакате да ги бришете %(object_name)s „%(escaped_object)s“? " "Сите овие ставки ќе бидат избришани:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Да, сигурен сум" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Избриши повеќе ставки" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -536,7 +548,7 @@ "Бришење на избраните %(objects_name)s ќе резултира со бришење на поврзани " "објекти, но немате одобрување да ги избришете следниве типови објекти:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -545,7 +557,7 @@ "Бришење на избраните %(objects_name)s бара бришење на следните поврзани " "објекти кои се заштитени:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -554,41 +566,56 @@ "Дали сте сигурни дека сакате да го избришете избраниот %(objects_name)s? " "Сите овие објекти и оние поврзани со нив ќе бидат избришани:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Отстрани" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Додадете уште %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Избриши?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Според %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Модели во %(name)s апликација" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Измени" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Немате дозвола ништо да уредува." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Последни акции" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Мои акции" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ништо не е достапно" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Непозната содржина" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +625,27 @@ "соодветни табели во базата се направени и потврдете дека базата може да биде " "прочитана од соодветниот корисник." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Лозинка:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Ја заборавивте вашата лозинка или корисничко име?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Датум/час" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Корисник" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Акција" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,113 +653,62 @@ "Овој објект нема историја на измени. Најверојатно не бил додаден со админ " "сајтот." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Прикажи ги сите" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Сними" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Барај" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s резултат" msgstr[1] "%(counter)s резултати" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "вкупно %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Сними како нова" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Сними и додади уште" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Сними и продолжи со уредување" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Прво, внесете корисничко име и лозинка. Потоа ќе можете да уредувате повеќе " -"кориснички опции." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Внесете корисничко име и лозинка." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Внесете нова лозинка за корисникот %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Лозинка" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Лозинка (повторно)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Заради верификација внесете ја истата лозинка како и горе." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Отстрани" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Додадете уште %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Избриши?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" "Ви благодариме што денеска поминавте квалитетно време со интернет страницава." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Најавете се повторно" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Измена на лозинка" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Успешна промена на лозинката" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Вашата лозинка беше сменета." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -740,46 +716,34 @@ "Заради сигурност ве молам внесете ја вашата стара лозинка и потоа внесете ја " "новата двапати за да може да се потврди дека правилно сте ја искуцале." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Стара лозинка" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Нова лозинка" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Промени ја мојата лозинка" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Ресетирање на лозинка" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Ресетирањето на лозинката заврши" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Вашата лозинка беше поставена. Сега можете да се најавите." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Одобрување за ресетирање на лозинка" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Внесете нова лозинка" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -787,19 +751,15 @@ "Ве молам внесете ја вашата нова лозинка двапати за да може да бидете сигурни " "дека правилно сте ја внеле." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Нова лозинка:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Потврди лозинка:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Неуспеа ресетирањето на лозинката" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,12 +767,7 @@ "Врската за ресетирање на лозинката беше невалидна, најверојатно бидејќи веќе " "била искористена. Ве молам повторно побарајте ресетирање на вашата лозинката." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Успешно е ресетирањето на лозинката" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -820,7 +775,7 @@ "Ви испративме инстуркции за внесување на вашата лозинка на email адресата " "што ја внесовте. Треба да ги добиете за кратко време." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -828,7 +783,7 @@ "Ако не примивте email, ве молиме осигурајте се дека сте ја внесле правата " "адреса кога се регистриравте и проверете го spam фолдерот." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -837,24 +792,24 @@ "Го примате овој email бидејќи побаравте ресетирање на лозинка за вашето " "корисничко име на %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Ве молам одите на следната страница и внесете нова лозинка:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Вашето корисничко име, во случај да сте го заборавиле:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Ви благодариме што го користите овој сајт!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Тимот на %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -862,28 +817,52 @@ "Ја заборавивте вашата лозинка? Внесете ја вашата email адреса подолу, ќе " "добиете порака со инструкции за промена на лозинката." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Email адреса:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Ресетирај ја мојата лозинка" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Сите датуми" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ништо)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Изберете %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Изберете %s за измена" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Датум:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Време:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Побарај" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Додади друго" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Моментално:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Измени:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ml/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,15 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Aby Thomas , 2014 # Jannis Leidel , 2011 # Rajeesh Nair , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-25 18:46+0000\n" +"Last-Translator: Aby Thomas \n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/django/" "language/ml/)\n" "MIME-Version: 1.0\n" @@ -18,12 +19,12 @@ "Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "ലഭ്യമായ %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +33,38 @@ "ഇതാണ് ലഭ്യമായ %s പട്ടിക. അതില്‍ ചിലത് തിരഞ്ഞെടുക്കാന്‍ താഴെ കളത്തില്‍ നിന്നും ഉചിതമായവ സെലക്ട് " "ചെയ്ത ശേഷം രണ്ടു കളങ്ങള്‍ക്കുമിടയിലെ \"തെരഞ്ഞെടുക്കൂ\" അടയാളത്തില്‍ ക്ലിക് ചെയ്യുക." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "ലഭ്യമായ %s പട്ടികയെ ഫില്‍ട്ടര്‍ ചെയ്തെടുക്കാന്‍ ഈ ബോക്സില്‍ ടൈപ്പ് ചെയ്യുക." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "എല്ലാം തെരഞ്ഞെടുക്കുക" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "%s എല്ലാം ഒന്നിച്ച് തെരഞ്ഞെടുക്കാന്‍ ക്ലിക് ചെയ്യുക." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "തെരഞ്ഞെടുക്കൂ" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "നീക്കം ചെയ്യൂ" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "തെരഞ്ഞെടുത്ത %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,22 +73,24 @@ "തെരഞ്ഞെടുക്കപ്പെട്ട %s പട്ടികയാണിത്. അവയില്‍ ചിലത് ഒഴിവാക്കണമെന്നുണ്ടെങ്കില്‍ താഴെ കളത്തില്‍ " "നിന്നും അവ സെലക്ട് ചെയ്ത് കളങ്ങള്‍ക്കിടയിലുള്ള \"നീക്കം ചെയ്യൂ\" എന്ന അടയാളത്തില്‍ ക്ലിക് ചെയ്യുക." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "എല്ലാം നീക്കം ചെയ്യുക" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "തെരഞ്ഞെടുക്കപ്പെട്ട %s എല്ലാം ഒരുമിച്ച് നീക്കം ചെയ്യാന്‍ ക്ലിക് ചെയ്യുക." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)sല്‍ %(sel)s തെരഞ്ഞെടുത്തു" msgstr[1] "%(cnt)sല്‍ %(sel)s എണ്ണം തെരഞ്ഞെടുത്തു" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -95,7 +98,8 @@ "വരുത്തിയ മാറ്റങ്ങള്‍ സേവ് ചെയ്തിട്ടില്ല. ഒരു ആക്ഷന്‍ പ്രയോഗിച്ചാല്‍ സേവ് ചെയ്യാത്ത മാറ്റങ്ങളെല്ലാം " "നഷ്ടപ്പെടും." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -104,7 +108,8 @@ "നിങ്ങള്‍ ഒരു ആക്ഷന്‍ തെരഞ്ഞെടുത്തിട്ടുണ്ട്. പക്ഷേ, കളങ്ങളിലെ മാറ്റങ്ങള്‍ ഇനിയും സേവ് ചെയ്യാനുണ്ട്. " "ആദ്യം സേവ്ചെയ്യാനായി OK ക്ലിക് ചെയ്യുക. അതിനു ശേഷം ആക്ഷന്‍ ഒന്നു കൂടി പ്രയോഗിക്കേണ്ടി വരും." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -113,68 +118,84 @@ "നിങ്ങള്‍ ഒരു ആക്ഷന്‍ തെരഞ്ഞെടുത്തിട്ടുണ്ട്. കളങ്ങളില്‍ സേവ് ചെയ്യാത്ത മാറ്റങ്ങള്‍ ഇല്ല. നിങ്ങള്‍സേവ് ബട്ടണ്‍ " "തന്നെയാണോ അതോ ഗോ ബട്ടണാണോ ഉദ്ദേശിച്ചത്." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "ജനുവരി ഫെബൃവരി മാര്‍ച്ച് ഏപ്രില്‍ മെയ് ജൂണ്‍ ജൂലൈ ആഗസ്ത് സെപ്തംബര്‍ ഒക്ടോബര്‍ നവംബര്‍ ഡിസംബര്‍" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "ഞാ തി ചൊ ബു വ്യാ വെ ശ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "കാണട്ടെ" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "മറയട്ടെ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "ഒർക്കുക: സെർവർ സമയത്തിനെക്കാളും നിങ്ങൾ %s സമയം മുൻപിലാണ്." +msgstr[1] "ഒർക്കുക: സെർവർ സമയത്തിനെക്കാളും നിങ്ങൾ %s സമയം മുൻപിലാണ്." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "ഒർക്കുക: സെർവർ സമയത്തിനെക്കാളും നിങ്ങൾ %s സമയം പിന്നിലാണ്." +msgstr[1] "ഒർക്കുക: സെർവർ സമയത്തിനെക്കാളും നിങ്ങൾ %s സമയം പിന്നിലാണ്." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ഇപ്പോള്‍" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "ഘടികാരം (ക്ലോക്ക്)" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "സമയം തെരഞ്ഞെടുക്കൂ" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "അര്‍ധരാത്രി" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "ഉച്ച" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "റദ്ദാക്കൂ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "ഇന്ന്" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "കലണ്ടര്‍" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "ഇന്നലെ" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "നാളെ" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "ജനുവരി ഫെബൃവരി മാര്‍ച്ച് ഏപ്രില്‍ മെയ് ജൂണ്‍ ജൂലൈ ആഗസ്ത് സെപ്തംബര്‍ ഒക്ടോബര്‍ നവംബര്‍ ഡിസംബര്‍" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "ഞാ തി ചൊ ബു വ്യാ വെ ശ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "കാണട്ടെ" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "മറയട്ടെ" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ml/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ml/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ml/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ml/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ml/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: +# Aby Thomas , 2014 # Jannis Leidel , 2011 # Junaid , 2012 -# Rajeesh Nair , 2011-2012 +# Rajeesh Nair , 2011-2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-25 19:51+0000\n" +"Last-Translator: Aby Thomas \n" "Language-Team: Malayalam (http://www.transifex.com/projects/p/django/" "language/ml/)\n" "MIME-Version: 1.0\n" @@ -19,460 +20,477 @@ "Language: ml\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "%(count)d %(items)s വിജയകരമായി ഡിലീറ്റ് ചെയ്തു." +msgstr "%(count)d %(items)s നീക്കം ചെയ്തു." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" -msgstr "Cannot delete %(name)s" +msgstr "%(name)s നീക്കം ചെയ്യാന്‍ കഴിയില്ല." -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "തീര്‍ച്ചയാണോ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" -msgstr "തെരഞ്ഞെടുത്ത %(verbose_name_plural)s ഡിലീറ്റ് ചെയ്യുക." +msgstr "തെരഞ്ഞെടുത്ത %(verbose_name_plural)s നീക്കം ചെയ്യുക." -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "ഭരണം" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "എല്ലാം" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "അതെ" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "അല്ല" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "അജ്ഞാതം" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "ഏതെങ്കിലും തീയതി" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "ഇന്ന്" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "കഴിഞ്ഞ ഏഴു ദിവസം" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "ഈ മാസം" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "ഈ വര്‍ഷം" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" +"ദയവായി സ്റ്റാഫ് അക്കൗണ്ടിനുവേണ്ടിയുള്ള ശരിയായ %(username)s -ഉം പാസ്‌വേഡും നല്കുക. രണ്ടു " +"കള്ളികളിലും അക്ഷരങ്ങള്‍ (ഇംഗ്ലീഷിലെ) വലിയക്ഷരമോ ചെറിയക്ഷരമോ എന്നത് പ്രധാനമാണെന്നത് " +"ശ്രദ്ധിയ്ക്കുക." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "താങ്കളുടെ സെഷന്റെ കാലാവധി കഴിഞ്ഞു. വീണ്ടും ലോഗിന്‍ ചെയ്യണം." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "ആക്ഷന്‍" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "ആക്ഷന്‍ സമയം" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "ഒബ്ജെക്ട് ഐഡി" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "ഒബ്ജെക്ട് സൂചന" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "ആക്ഷന്‍ ഫ്ളാഗ്" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "സന്ദേശം മാറ്റുക" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ലോഗ് എന്ട്രി" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "ലോഗ് എന്ട്രികള്‍" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" ചേര്‍ത്തു." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\"ല്‍ %(changes)s മാറ്റം വരുത്തി" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" നീക്കം ചെയ്തു." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "ലോഗ്‌എന്‍ട്രി വസ്തു" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "ഒന്നുമില്ല" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s മാറ്റി." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ഉം" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ചേര്‍ത്തു." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ന്റെ %(list)s മാറ്റി." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ഡിലീറ്റ് ചെയ്തു." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "ഒരു മാറ്റവുമില്ല." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" കൂട്ടി ചേര്‍ത്തു. താഴെ നിന്നും മാറ്റം വരുത്താം." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." -msgstr "" +msgstr "%(name)s \"%(obj)s\" കൂട്ടി ചേര്‍ത്തു. താഴെ ഒരു %(name)s കൂടെ കൂട്ടിച്ചേർക്കാം." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" വിജയകരമായി കൂട്ടിച്ചേര്ത്തു." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." -msgstr "" +msgstr "%(name)s \"%(obj)s\" മാറ്റം വരുത്തി. താഴെ വീണ്ടും മാറ്റം വരുത്താം." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." -msgstr "" +msgstr "%(name)s \"%(obj)s\" മാറ്റം വരുത്തി. താഴെ ഒരു %(name)s കൂടെ കൂട്ടിച്ചേർക്കാം." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ല്‍ മാറ്റം വരുത്തി." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "ആക്ഷന്‍ നടപ്പിലാക്കേണ്ട വകകള്‍ തെരഞ്ഞെടുക്കണം. ഒന്നും മാറ്റിയിട്ടില്ല." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "ആക്ഷനൊന്നും തെരഞ്ഞെടുത്തില്ല." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s ചേര്‍ക്കുക" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" നീക്കം ചെയ്തു." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r എന്ന പ്രാഥമിക കീ ഉള്ള %(name)s വസ്തു ഒന്നും നിലവിലില്ല." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s ചേര്‍ക്കുക" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s മാറ്റാം" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "ഡേറ്റാബേസ് തകരാറാണ്." -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ല്‍ മാറ്റം വരുത്തി." msgstr[1] "%(count)s %(name)s ല്‍ മാറ്റം വരുത്തി." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s തെരഞ്ഞെടുത്തു." msgstr[1] "%(total_count)sഉം തെരഞ്ഞെടുത്തു." -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s ല്‍ ഒന്നും തെരഞ്ഞെടുത്തില്ല." -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" ഡിലീറ്റ് ചെയ്തു." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "%s ലെ മാറ്റങ്ങള്‍." #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +" %(class_name)s %(instance)s നീക്കം ചെയ്യണമെങ്കിൽ അതിനോട് ബന്ധപ്പെട്ടതായ താഴെപ്പറയുന്ന " +"എല്ലാ വസ്തുക്കളും നീക്കം ചെയ്യുന്നതാണ്: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ലോഗ്-ഇന്‍" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ജാംഗോ സൈറ്റ് അഡ്മിന്‍" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ജാംഗോ ഭരണം" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "സൈറ്റ് ഭരണം" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s ഭരണം" - -#: widgets.py:90 -msgid "Date:" -msgstr "തീയതി:" - -#: widgets.py:91 -msgid "Time:" -msgstr "സമയം:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "തിരയുക" - -#: widgets.py:260 -msgid "Add Another" -msgstr "ഒന്നു കൂടി ചേര്‍ക്കുക" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ലോഗ്-ഇന്‍" -#: widgets.py:303 -msgid "Change:" -msgstr "" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s ഭരണം" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "പേജ് കണ്ടില്ല" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "ക്ഷമിക്കണം, ആവശ്യപ്പെട്ട പേജ് കണ്ടെത്താന്‍ കഴിഞ്ഞില്ല." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "പൂമുഖം" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "സെര്‍വര്‍ തകരാറാണ്" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "സെര്‍വര്‍ തകരാറാണ് (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "സെര്‍വര്‍ തകരാറാണ് (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" +"എന്തോ തകരാറ് സംഭവിച്ചു. ബന്ധപ്പെട്ട സൈറ്റ് ഭരണകർത്താക്കളെ ഈമെയിൽ മുഖാന്തരം അറിയിച്ചിട്ടുണ്ട്. " +"ഷമയൊടെ കത്തിരിക്കുനതിന് നന്ദി." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "തെരഞ്ഞെടുത്ത ആക്ഷന്‍ നടപ്പിലാക്കുക" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Go" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "എല്ലാ പേജിലേയും വസ്തുക്കള്‍ തെരഞ്ഞെടുക്കാന്‍ ഇവിടെ ക്ലിക് ചെയ്യുക." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "മുഴുവന്‍ %(total_count)s %(module_name)s ഉം തെരഞ്ഞെടുക്കുക" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "തെരഞ്ഞെടുത്തത് റദ്ദാക്കുക." -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "ആദ്യം, യൂസര്‍ നാമവും പാസ് വേര്‍ഡും നല്കണം. പിന്നെ, കൂടുതല്‍ കാര്യങ്ങള്‍ മാറ്റാവുന്നതാണ്." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Enter a username and password." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "പാസ് വേര്‍ഡ് മാറ്റുക." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "ദയവായി താഴെയുള്ള തെറ്റുകള്‍ പരിഹരിക്കുക." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "ദയവായി താഴെയുള്ള തെറ്റുകള്‍ പരിഹരിക്കുക." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s ന് പുതിയ പാസ് വേര്‍ഡ് നല്കുക." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "പാസ് വേര്‍ഡ്" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "പാസ് വേര്‍ഡ് (വീണ്ടും)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "പാസ് വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "സ്വാഗതം, " -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "സഹായക്കുറിപ്പുകള്‍" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "പാസ് വേര്‍ഡ് മാറ്റുക." - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "പുറത്ത് കടക്കുക." -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ജാംഗോ സൈറ്റ് അഡ്മിന്‍" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ജാംഗോ ഭരണം" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" -msgstr "Add" +msgstr "ചേര്‍ക്കുക" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "ചരിത്രം" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "View on site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "ദയവായി താഴെയുള്ള തെറ്റുകള്‍ പരിഹരിക്കുക." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" -msgstr "Add %(name)s" +msgstr "%(name)s ചേര്‍ക്കുക" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" -msgstr "Filter" +msgstr "അരിപ്പ" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "ക്രമീകരണത്തില്‍ നിന്നും ഒഴിവാക്കുക" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "ക്രമീകരണത്തിനുള്ള മുന്‍ഗണന: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "ക്രമീകരണം വിപരീത ദിശയിലാക്കുക." -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" -msgstr "Delete" +msgstr "നീക്കം ചെയ്യുക" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -483,97 +501,111 @@ "വസ്തുക്കളുംഡിലീറ്റ് ആവും. പക്ഷേ നിങ്ങള്‍ക്ക് താഴെ പറഞ്ഞ തരം വസ്തുക്കള്‍ ഡിലീറ്റ് ചെയ്യാനുള്ള അനുമതി " "ഇല്ല:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " -"following protected related objects:" +"തിരഞ്ഞെടുക്കപ്പെട്ട %(object_name)s '%(escaped_object)s' നീക്കം ചെയ്യണമെങ്കിൽ അതിനോട് " +"ബന്ധപ്പെട്ടതായ താഴെപ്പറയുന്ന എല്ലാ വസ്തുക്കളും നീക്കം ചെയ്യുന്നതാണ്:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"%(object_name)s \"%(escaped_object)s\" ഡിലീറ്റ് ചെയ്യണമെന്ന് തീര്‍ച്ചയാണോ?അതുമായി " -"ബന്ധമുള്ള താഴെപ്പറയുന്ന വസ്തുക്കളെല്ലാം ഡിലീറ്റ് ആവും:" +"%(object_name)s \"%(escaped_object)s\" നീക്കം ചെയ്യണമെന്ന് ഉറപ്പാണോ?അതുമായി ബന്ധമുള്ള " +"താഴെപ്പറയുന്ന വസ്തുക്കളെല്ലാം നീക്കം ചെയ്യുന്നതാണ്:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "അതെ, തീര്‍ച്ചയാണ്" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" -msgstr "ഒന്നിലേറെ വസ്തുക്കള്‍ ഡിലീറ്റ് ചെയ്തോളൂ" +msgstr "ഒന്നിലേറെ വസ്തുക്കള്‍ നീക്കം ചെയ്യുക" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" -"Deleting the selected %(objects_name)s would result in deleting related " -"objects, but your account doesn't have permission to delete the following " -"types of objects:" +"തിരഞ്ഞെടുക്കപ്പെട്ട %(objects_name)s നീക്കം ചെയ്താൽ അതിനോട് ബന്ധപ്പെട്ടതായ താഴെപ്പറയുന്ന " +"എല്ലാ വസ്തുക്കളും നീക്കം ചെയ്യുന്നതാണ്, പക്ഷെ അതിനുളള അവകാശം അക്കൗണ്ടിനില്ല:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -"Deleting the selected %(objects_name)s would require deleting the following " -"protected related objects:" +"തിരഞ്ഞെടുക്കപ്പെട്ട %(objects_name)s നീക്കം ചെയ്യണമെങ്കിൽ അതിനോട് ബന്ധപ്പെട്ടതായ " +"താഴെപ്പറയുന്ന എല്ലാ വസ്തുക്കളും നീക്കം ചെയ്യുന്നതാണ്:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -"Are you sure you want to delete the selected %(objects_name)s? All of the " -"following objects and their related items will be deleted:" +"തിരഞ്ഞെടുക്കപ്പെട്ട %(objects_name)s നീക്കം ചെയ്യണമെന്നു ഉറപ്പാണോ ? തിരഞ്ഞെടുക്കപ്പെട്ടതും " +"അതിനോട് ബന്ധപ്പെട്ടതും ആയ എല്ലാ താഴെപ്പറയുന്ന വസ്തുക്കളും നീക്കം ചെയ്യുന്നതാണ്:" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "നീക്കം ചെയ്യുക" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "%(verbose_name)s ഒന്നു കൂടി ചേര്‍ക്കുക" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "ഡിലീറ്റ് ചെയ്യട്ടെ?" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " -msgstr " By %(filter_title)s " +msgstr "%(filter_title)s ആൽ" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" -msgstr "" +msgstr "%(name)s മാതൃകയിലുള്ള" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "മാറ്റുക" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "ഒന്നിലും മാറ്റം വരുത്താനുള്ള അനുമതി ഇല്ല." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "സമീപകാല പ്രവ്രുത്തികള്‍" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "എന്റെ പ്രവ്രുത്തികള്‍" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "ഒന്നും ലഭ്യമല്ല" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "ഉള്ളടക്കം അറിയില്ല." -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -582,27 +614,27 @@ "നിങ്ങളുടെ ഡേറ്റാബേസ് ഇന്‍സ്ടാലേഷനില്‍ എന്തോ പിശകുണ്ട്. ശരിയായ ടേബിളുകള്‍ ഉണ്ടെന്നും ഡേറ്റാബേസ് " "വായനായോഗ്യമാണെന്നും ഉറപ്പു വരുത്തുക." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "പാസ് വേര്‍ഡ്" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "രഹസ്യവാക്കോ ഉപയോക്തൃനാമമോ മറന്നുപോയോ?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "തീയതി/സമയം" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "യൂസര്‍" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "ആക്ഷന്‍" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -610,110 +642,61 @@ "ഈ വസ്തുവിന്റെ മാറ്റങ്ങളുടെ ചരിത്രം ലഭ്യമല്ല. ഒരുപക്ഷെ ഇത് അഡ്മിന്‍ സൈറ്റ് വഴി " "ചേര്‍ത്തതായിരിക്കില്ല." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "എല്ലാം കാണട്ടെ" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "സേവ് ചെയ്യണം" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "പരതുക" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s results" -msgstr[1] "%(counter)s results" +msgstr[1] "%(counter)s ഫലം" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "ആകെ %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "പുതിയതായി സേവ് ചെയ്യണം" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "സേവ് ചെയ്ത ശേഷം വേറെ ചേര്‍ക്കണം" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "സേവ് ചെയ്ത ശേഷം മാറ്റം വരുത്താം" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "ആദ്യം, യൂസര്‍ നാമവും പാസ് വേര്‍ഡും നല്കണം. പിന്നെ, കൂടുതല്‍ കാര്യങ്ങള്‍ മാറ്റാവുന്നതാണ്." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Enter a username and password." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s ന് പുതിയ പാസ് വേര്‍ഡ് നല്കുക." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "പാസ് വേര്‍ഡ്" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "പാസ് വേര്‍ഡ് (വീണ്ടും)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "പാസ് വേര്‍ഡ് മുകളിലെ പോലെ തന്നെ നല്കുക. (ഉറപ്പു വരുത്താനാണ്.)" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "നീക്കം ചെയ്യുക" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "%(verbose_name)s ഒന്നു കൂടി ചേര്‍ക്കുക" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "ഡിലീറ്റ് ചെയ്യട്ടെ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ഈ വെബ് സൈറ്റില്‍ കുറെ നല്ല സമയം ചെലവഴിച്ചതിനു നന്ദി." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "വീണ്ടും ലോഗ്-ഇന്‍ ചെയ്യുക." -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "പാസ് വേര്‍ഡ് മാറ്റം" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "പാസ് വേര്‍ഡ് മാറ്റം വിജയിച്ചു" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "നിങ്ങളുടെ പാസ് വേര്‍ഡ് മാറ്റിക്കഴിഞ്ഞു." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -721,46 +704,34 @@ "സുരക്ഷയ്ക്കായി നിങ്ങളുടെ പഴയ പാസ് വേര്‍ഡ് നല്കുക. പിന്നെ, പുതിയ പാസ് വേര്‍ഡ് രണ്ട് തവണ നല്കുക. " "(ടയ്പ് ചെയ്തതു ശരിയാണെന്ന് ഉറപ്പാക്കാന്‍)" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "പഴയ പാസ് വേര്‍ഡ്" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "പുതിയ പാസ് വേര്‍ഡ്" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "എന്റെ പാസ് വേര്‍ഡ് മാറ്റണം" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ പൂര്‍ണം" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "നിങ്ങളുടെ പാസ് വേര്‍ഡ് തയ്യാര്‍. ഇനി ലോഗ്-ഇന്‍ ചെയ്യാം." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ ഉറപ്പാക്കല്‍" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "പുതിയ പാസ് വേര്‍ഡ് നല്കൂ" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -768,19 +739,15 @@ "ദയവായി നിങ്ങളുടെ പുതിയ പാസ് വേര്‍ഡ് രണ്ടു തവണ നല്കണം. ശരിയായാണ് ടൈപ്പു ചെയ്തത് എന്നു " "ഉറപ്പിക്കാനാണ്." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "പുതിയ പാസ് വേര്‍ഡ്:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "പാസ് വേര്‍ഡ് ഉറപ്പാക്കൂ:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ പരാജയം" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -788,75 +755,101 @@ "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കാന്‍ നല്കിയ ലിങ്ക് യോഗ്യമല്ല. ഒരു പക്ഷേ, അതു മുന്പ് തന്നെ ഉപയോഗിച്ചു " "കഴിഞ്ഞതാവാം. പുതിയ ഒരു ലിങ്കിന് അപേക്ഷിക്കൂ." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കല്‍ വിജയം" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" +"ഞങ്ങൾ പാസ് വേർഡ്‌ മാറ്റാനുള്ള നിർദേശങ്ങൾ ഇമെയിലിൽ അയച്ചിട്ടുണ്ട്. അല്പസമയത്തിനുള്ളിൽ ലഭിക്കുണം." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"ഞങ്ങളുടെ ഇമെയിൽ കിട്ടിയില്ലെങ്കിൽ രജിസ്റ്റർ ചെയ്യാൻ ഉപയോകിച്ച അതെ ഇമെയിൽ വിലാസം തന്നെ " +"ആണോ എന്ന് ഉറപ്പ് വരുത്തുക. ശരിയാണെങ്കിൽ സ്പാം ഫോൾഡറിലും നോക്കുക " -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" +"നിങ്ങളുൾ പാസ് വേർഡ്‌ മാറ്റാനുള്ള നിർദേശങ്ങൾ %(site_name)s ഇൽ ആവശ്യപ്പെട്ടതുകൊണ്ടാണ് ഈ " +"ഇമെയിൽ സന്ദേശം ലഭിച്ചദ്." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "ദയവായി താഴെ പറയുന്ന പേജ് സന്ദര്‍ശിച്ച് പുതിയ പാസ് വേര്‍ഡ് തെരഞ്ഞെടുക്കുക:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "നിങ്ങള്‍ മറന്നെങ്കില്‍, നിങ്ങളുടെ യൂസര്‍ നാമം, :" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "ഞങ്ങളുടെ സൈറ്റ് ഉപയോഗിച്ചതിന് നന്ദി!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" -msgstr "The %(site_name)s team" +msgstr "%(site_name)s പക്ഷം" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" +"പാസ് വേര്‍ഡ് മറന്നു പോയോ? നിങ്ങളുടെ ഇമെയിൽ വിലാസം താഴെ എഴുതുക. പാസ് വേർഡ്‌ മാറ്റാനുള്ള " +"നിർദേശങ്ങൾ ഇമെയിലിൽ അയച്ചു തരുന്നതായിരിക്കും." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "" +msgstr "ഇമെയിൽ വിലാസം:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "എന്റെ പാസ് വേര്‍ഡ് പുനസ്ഥാപിക്കൂ" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "എല്ലാ തീയതികളും" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" -msgstr "(None)" +msgstr "(ഒന്നുമില്ല)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s തെരഞ്ഞെടുക്കൂ" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "മാറ്റാനുള്ള %s തെരഞ്ഞെടുക്കൂ" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "തീയതി:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "സമയം:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "തിരയുക" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "ഒന്നു കൂടി ചേര്‍ക്കുക" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "പ്രചാരത്തിൽ:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "മാറ്റം" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/mn/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,15 +2,16 @@ # # Translators: # Tsolmon , 2012 +# Zorig , 2014 # Анхбаяр Анхаа , 2011-2012 # Ганзориг БП , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-10 10:40+0000\n" +"Last-Translator: Zorig \n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/django/" "language/mn/)\n" "MIME-Version: 1.0\n" @@ -19,12 +20,12 @@ "Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Боломжтой %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +34,38 @@ "Энэ %s жагсаалт нь боломжит утгын жагсаалт. Та аль нэгийг нь сонгоод \"Сонгох" "\" дээр дарж нөгөө хэсэгт оруулах боломжтой." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Энэ нүдэнд бичээд дараах %s жагсаалтаас шүүнэ үү. " -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Шүүлтүүр" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Бүгдийг нь сонгох" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Бүгдийг сонгох бол %s дарна уу" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Сонгох" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Хас" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Сонгогдсон %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,29 +74,32 @@ "Энэ %s сонгогдсон утгуудыг жагсаалт. Та аль нэгийг нь хасахыг хүсвэл сонгоох " "\"Хас\" дээр дарна уу." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Бүгдийг арилгах" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "%s ийн сонгоод бүгдийг нь арилгана" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s ээс %(cnt)s сонгосон" msgstr[1] "%(sel)s ээс %(cnt)s сонгосон" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" "Хадгалаагүй өөрчлөлтүүд байна. Энэ үйлдэлийг хийвэл өөрчлөлтүүд устах болно." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +109,8 @@ "талбаруудад нь оруулагүй байна. OK дарж сануулна уу. Энэ үйлдлийг та дахин " "хийх шаардлагатай." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,68 +119,84 @@ "Та 1 үйлдлийг сонгосон байна бас та ямарваа өөрчлөлт оруулсангүй. Та Save " "товчлуур биш Go товчлуурыг хайж байгаа бололтой." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "Хулгана Үхэр Бар Туулай Луу Могой Морь Хонь Бич Тахиа Нохой Гахай" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Ня Да Мя Лх Пү Ба Бя" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Үзэх" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Нуух" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Та серверийн цагаас %s цагийн түрүүнд явж байна" +msgstr[1] "Та серверийн цагаас %s цагийн түрүүнд явж байна" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Та серверийн цагаас %s цагаар хоцорч байна" +msgstr[1] "Та серверийн цагаас %s цагаар хоцорч байна" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Одоо" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Цаг" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Цаг сонгох" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Шөнө дунд" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 цаг" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Үд дунд" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Болих" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Өнөөдөр" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Хуанли" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Өчигдөр" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Маргааш" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "Хулгана Үхэр Бар Туулай Луу Могой Морь Хонь Бич Тахиа Нохой Гахай" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Ня Да Мя Лх Пү Ба Бя" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Үзэх" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Нуух" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/mn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/mn/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/mn/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/mn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/mn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# ankhaa1002 , 2013 +# Ankhbayar , 2013 # Jannis Leidel , 2011 # jargalan , 2011 -# Анхбаяр Анхаа , 2013 +# Анхбаяр Анхаа , 2013-2014 # Баясгалан Цэвлээ , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-09-30 09:37+0000\n" -"Last-Translator: ankhaa1002 \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-12 07:59+0000\n" +"Last-Translator: Анхбаяр Анхаа \n" "Language-Team: Mongolian (http://www.transifex.com/projects/p/django/" "language/mn/)\n" "MIME-Version: 1.0\n" @@ -21,62 +21,68 @@ "Language: mn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(items)s ээс %(count)d-ийг амжилттай устгалаа." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s устгаж чадахгүй." -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Итгэлтэй байна уу?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Сонгосон %(verbose_name_plural)s-ийг устга" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Удирдлага" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Бүх " -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Тийм" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Үгүй" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Тодорхойгүй" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Бүх өдөр" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Өнөөдөр" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Өнгөрсөн долоо хоног" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Энэ сар" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Энэ жил" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,94 +91,91 @@ "Ажилтан хэрэглэгчийн %(username)s ба нууц үгийг зөв оруулна уу. Хоёр талбарт " "том жижигээр үсгээр бичих ялгаатай." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Орсон хуудас тань хүчингүй болсон тул ахин нэвтрэнэ үү." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Үйлдэл:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "үйлдлийн хугацаа" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "обектийн id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "обектийн хамаарал" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "үйлдэлийн тэмдэг" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "өөрчлөлтийн мэдээлэл" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "лог өгөгдөл" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "лог өгөгдөлүүд" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" нэмсэн." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\"-ийг %(changes)s өөрчилсөн." -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" устгасан." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Лог бүртгэлийн обект" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Хоосон" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Өөрчлөгдсөн %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ба" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Нэмэгдсэн %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\"-ийн өөрчлөгдсөн %(list)s" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Устгасан %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Өөрчилсөн талбар алга байна." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -180,7 +183,7 @@ "%(name)s \"%(obj)s\" амжилттай нэмэгдлээ. Доорх хэсэгт үүнийг ахин засварлах " "боломжтой." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +192,12 @@ "%(name)s \"%(obj)s\" амжилттай нэмэгдлээ. Доорх хэсгээс %(name)s өөрийн " "нэмэх боломжтой." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr " %(name)s \"%(obj)s\" амжилттай нэмэгдлээ." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -203,7 +206,7 @@ "%(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. Доорх хэсэгт дахин засах " "боломжтой." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -212,163 +215,149 @@ "%(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. Доорх %(name)s хэсгээс дахин " "нэмэх боломжтой." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr " %(name)s \"%(obj)s\" амжилттай өөрчлөгдлөө. " -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Үйлдэл хийхийн тулд Та ядаж 1-ийг сонгох хэрэгтэй. Өөрчилөлт хийгдсэнгүй." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Үйлдэл сонгоогүй." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s-ийг нэмэх" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr " %(name)s \"%(obj)s\" амжилттай устгагдлаа." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s обектийн үндсэн түлхүүр %(key)r олдохгүй байна." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s-ийг нэмэх" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s-ийг өөрчлөх" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Өгөгдлийн сангийн алдаа" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s-ийг амжилттай өөрчиллөө." msgstr[1] "%(count)s %(name)s-ийг амжилттай өөрчиллөө." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Бүгд %(total_count)s сонгогдсон" msgstr[1] "Бүгд %(total_count)s сонгогдсон" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s оос 0 сонгосон" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr " %(name)s \"%(obj)s\" амжилттай устгагдлаа." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Өөрчлөлтийн түүх: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(instance)s %(class_name)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -" %(object_name)s '%(escaped_object)s'-ийг устгаж байна. Дараах хамгаадагдсан " -"обектуудтай холбогдсон байна:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Нэвтрэх" - -#: sites.py:386 -msgid "Site administration" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" msgstr "Сайтын удирдлага" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s удирдлага" - -#: widgets.py:90 -msgid "Date:" -msgstr "Огноо:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Цаг:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Хайх" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Удирдлага" -#: widgets.py:260 -msgid "Add Another" -msgstr "Ахиад нэмэх" +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "Сайтын удирдлага" -#: widgets.py:302 -msgid "Currently:" -msgstr "Одоогийнх:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Нэвтрэх" -#: widgets.py:303 -msgid "Change:" -msgstr "Өөрчилөлт:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s удирдлага" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Хуудас олдсонгүй." -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Уучлаарай, хандахыг хүссэн хуудас тань олдсонгүй." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Нүүр" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Серверийн алдаа" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Серверийн алдаа (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Серверийн алдаа (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -376,120 +365,141 @@ "Алдаа гарсан байна. Энэ алдааг сайт хариуцагчид цахим шуудангаар мэдэгдсэн " "бөгөөд тэд нэн даруй засах хэрэгтэй. Хүлээцтэй хандсанд баярлалаа." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Сонгосон үйлдэлийг ажилуулах" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Гүйцэтгэх" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Бүх хуудаснууд дээрх объектуудыг сонгох" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Бүгдийг сонгох %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Сонгосонг цэвэрлэх" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Эхлээд хэрэглэгчийн нэр нууц үгээ оруулна уу. Ингэснээр та хэрэглэгчийн " +"сонголтыг нэмж засварлах боломжтой болно. " + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Хэрэглэгчийн нэр ба нууц үгээ оруулна." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Нууц үг өөрчлөх" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Доорх алдаануудыг засна уу." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Доор гарсан алдаануудыг засна уу." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s.хэрэглэгчид шинэ нууц үг оруулна уу." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Нууц үг " + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Нууц үг (ахиад)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Батлахын тулд дээрх нууц үгээ ахин хийнэ үү." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Тавтай морилно уу" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Баримтжуулалт" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Нууц үг өөрчлөх" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Гарах" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Сайтын удирдлага" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Удирдлага" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Нэмэх" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Түүх" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Сайтаас харах" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Доорх алдаануудыг засна уу." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Доор гарсан алдаануудыг засна уу." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s нэмэх" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Шүүлтүүр" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Эрэмблэлтээс хасах" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Эрэмблэх урьтамж: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Эрэмбэлэлтийг харуул" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Устгах" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -499,7 +509,7 @@ "%(object_name)s '%(escaped_object)s'-ийг устгавал холбогдох объект нь устах " "ч бүртгэл тань дараах төрлийн объектуудийг устгах зөвшөөрөлгүй байна:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -508,7 +518,7 @@ " %(object_name)s обектийг устгаж байна. '%(escaped_object)s' холбоотой " "хамгаалагдсан обектуудыг заавал утсгах хэрэгтэй :" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -517,16 +527,16 @@ "Та %(object_name)s \"%(escaped_object)s\"-ийг устгахдаа итгэлтэй байна уу? " "Үүнийг устгавал дараах холбогдох зүйлс нь бүгд устана:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Тийм, итгэлтэй байна." -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Олон обектууд устгах" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -536,7 +546,7 @@ "Сонгосон %(objects_name)s обектуудыг устгасанаар хамаатай бүх обкетууд устах " "болно. Гэхдээ таньд эрх эдгээр төрлийн обектуудыг утсгах эрх байхгүй байна: " -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -545,7 +555,7 @@ "%(objects_name)s обектуудыг утсгаж байна дараах холбоотой хамгаалагдсан " "обектуудыг устгах шаардлагатай:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -554,41 +564,56 @@ "Та %(objects_name)s ийг устгах гэж байна итгэлтэй байна? Дараах обектууд " "болон холбоотой зүйлс хамт устагдах болно:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Хасах" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Өөр %(verbose_name)s нэмэх " + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Устгах уу?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s -ээр" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s хэрэглүүр дэх моделууд." -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Өөрчлөх" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Та ямар нэг зүйл засварлах зөвшөөрөлгүй байна." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Сүүлд хийсэн үйлдлүүд" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Миний үйлдлүүд" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Үйлдэл алга" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Тодорхойгүй агуулга" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +623,27 @@ "зохих хүснэгт үүсгэгдсэн эсэх, өгөгдлийн санг зохих хэрэглэгч унших " "боломжтой байгаа эсэхийг шалгаарай." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Нууц үг:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Таны мартсан нууц үг эсвэл нэрвтэр нэр?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Огноо/цаг" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Хэрэглэгч" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Үйлдэл" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,112 +651,61 @@ "Уг объектэд өөрчлөлтийн түүх байхгүй байна. Магадгүй үүнийг уг удирдлагын " "сайтаар дамжуулан нэмээгүй байх." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Бүгдийг харуулах" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Хадгалах" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Хайлт" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s үр дүн" msgstr[1] "%(counter)s үр дүн" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "Нийт %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Шинээр хадгалах" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Хадгалаад өөрийг нэмэх" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Хадгалаад нэмж засах" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Эхлээд хэрэглэгчийн нэр нууц үгээ оруулна уу. Ингэснээр та хэрэглэгчийн " -"сонголтыг нэмж засварлах боломжтой болно. " - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Хэрэглэгчийн нэр ба нууц үгээ оруулна." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s.хэрэглэгчид шинэ нууц үг оруулна уу." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Нууц үг " - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Нууц үг (ахиад)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Батлахын тулд дээрх нууц үгээ ахин хийнэ үү." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Хасах" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Өөр %(verbose_name)s нэмэх " - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Устгах уу?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Манай вэб сайтыг ашигласанд баярлалаа." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Ахин нэвтрэх " -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Нууц үгийн өөрчлөлт" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Нууц үгийн өөрчлөлт амжилттай" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Нууц үг тань өөрчлөгдлөө." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -739,46 +713,34 @@ "Аюулгүй байдлын үүднээс хуучин нууц үгээ оруулаад шинэ нууц үгээ хоёр удаа " "хийнэ үү. Ингэснээр нууц үгээ зөв бичиж байгаа эсэхийг тань шалгах юм." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Хуучин нууц үг" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Шинэ нууц үг" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Нууц үгээ солих" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Нууц үг шинэчилэх" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Нууц үг шинэчилэх явц дууслаа" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Та нууц үгтэй боллоо. Одоо бүртгэлд нэвтрэх боломжтой." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Нууц үг шинэчилэхийг баталгаажуулах" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Шинэ нууц үг оруулах" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -786,19 +748,15 @@ "Шинэ нууц үгээ хоёр удаа оруулна уу. Ингэснээр нууц үгээ зөв бичиж байгаа " "эсэхийг тань шалгах юм. " -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Шинэ нууц үг:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Нууц үгээ батлах:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Нууц үг шинэчилэх амжилтгүй боллоо" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -806,12 +764,7 @@ "Нууц үг авах холбоос болохгүй байна. Үүнийг аль хэдийнэ хэрэглэснээс болсон " "байж болзошгүй. Шинэ нууц үг авахаар хүсэлт гаргана уу. " -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Нууц үг шинэчилэх амжилттай боллоо" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -819,7 +772,7 @@ "Бид таний оруулсан email хаягруу нууц үг оруулах заавар явуулсан. Та удахгүй " "хүлээж авах болно. " -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -827,7 +780,7 @@ "Хэрвээ та email хүлээж аваагүй бол оруулсан email хаягаараа бүртгүүлсэн " "эсхээ шалгаад мөн email ийнхаа Spam фолдер ийг шалгана уу." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -836,24 +789,24 @@ "%(site_name)s сайтанд бүртгүүлсэн эрхийн нууц үгийг сэргээх хүсэлт гаргасан " "учир энэ имайл ийг та хүлээн авсан болно. " -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Дараах хуудас руу орон шинэ нууц үг сонгоно уу:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Хэрэглэгчийн нэрээ мартсан бол :" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Манай сайтыг хэрэглэсэнд баярлалаа!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s баг" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -861,28 +814,52 @@ "Нууц үгээ мартчихсан уу? Доорх хэсэгт цахим шуудангийн хаягаа оруулвал бид " "хаягаар тань нууц үг сэргэх зааварчилгаа явуулах болно." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "ИМайл хаяг:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Нууц үгээ шинэчлэх" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Бүх огноо" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Хоосон)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s-г сонго" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Өөрчлөх %s-г сонгоно уу" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Огноо:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Цаг:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Хайх" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Ахиад нэмэх" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Одоогийнх:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Өөрчилөлт:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/mr/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/mr/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/mr/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/mr/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/mr/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/mr/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,188 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2013-04-25 07:59+0000\n" +"Last-Translator: Django team\n" +"Language-Team: Marathi (http://www.transifex.com/projects/p/django/language/" +"mr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: mr\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/mr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/mr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/mr/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/mr/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/mr/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/mr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -0,0 +1,814 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Marathi (http://www.transifex.com/projects/p/django/language/" +"mr/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: mr\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "" + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "" + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "" + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "" + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "" + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "" + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "" + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "" + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "" + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "" + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "" + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "" + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "" + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr "" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/my/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Yhal Htet Aung , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-05-01 13:16+0000\n" -"Last-Translator: Yhal Htet Aung \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/" "my/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ "Language: my\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s ကိုရယူနိုင်" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -31,38 +31,38 @@ "%s သည်ရယူနိုင်သောစာရင်းဖြစ်။ အောက်ဖော်ပြပါဘူးများတွင်အချို့ကိုရွေးချယ်နိုင်ပြီးဘူးနှစ်ခုကြားရှိ\"ရွေး" "\"များကိုကလစ်နှိပ်။" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "ယခုဘူးထဲတွင်စာသားရိုက်ထည့်ပြီး %s ရယူနိုင်သောစာရင်းကိုစိစစ်နိုင်။" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "စီစစ်မှု" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "အားလံုးရွေး" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "%s အားလံုးကိုတစ်ကြိမ်တည်းဖြင့်ရွေးချယ်ရန်ကလစ်နှိပ်။" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "ရွေး" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "ဖယ်ရှား" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s ရွေးပြီး" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -71,102 +71,120 @@ "%s သည်ရယူနိုင်သောစာရင်းဖြစ်။ အောက်ဖော်ပြပါဘူးများတွင်အချို့ကိုဖယ်ရှားနိုင်ပြီးဘူးနှစ်ခုကြားရှိ\"ဖယ်ရှား" "\"ကိုကလစ်နှိပ်။" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "အားလံုးဖယ်ရှား" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "%s အားလံုးကိုတစ်ကြိမ်တည်းဖြင့်ဖယ်ရှားရန်ကလစ်နှိပ်။" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s မှ %(sel)s ရွေးချယ်ပြီး" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "နွေ လာ ဂါ ဟူး တေး ကြာ နေ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "ပြသ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "ဖုံးကွယ်" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ယခု" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "နာရီ" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "အချိန်ရွေးပါ" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "သန်းခေါင်" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "မနက်၆နာရီ" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "မွန်းတည့်" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "ပယ်ဖျက်" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "ယနေ့" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "ပြက္ခဒိန်" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "မနေ့" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "မနက်ဖြန်" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "နွေ လာ ဂါ ဟူး တေး ကြာ နေ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "ပြသ" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "ဖုံးကွယ်" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/my/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/my/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/my/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/my/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/my/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/my/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Yhal Htet Aung , 2013 +# Yhal Htet Aung , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-04 03:24+0000\n" +"Last-Translator: Yhal Htet Aung \n" "Language-Team: Burmese (http://www.transifex.com/projects/p/django/language/" "my/)\n" "MIME-Version: 1.0\n" @@ -17,458 +17,468 @@ "Language: my\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" -msgstr "အားလံုး" +msgstr "အားလုံး" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "ဟုတ်" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "မဟုတ်" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "အမည်မသိ" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "ယနေ့" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" -msgstr "" +msgstr "ယခုလ" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" -msgstr "" +msgstr "ယခုနှစ်" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" -msgstr "" +msgstr "လုပ်ဆောင်ချက်:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "နှင့်" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" -msgstr "" +msgstr "အချက်အလက်အစုအမှား" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ဖွင့်ဝင်" - -#: sites.py:386 -msgid "Site administration" -msgstr "" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "" - -#: widgets.py:91 -msgid "Time:" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" msgstr "" -#: widgets.py:165 -msgid "Lookup" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" msgstr "" -#: widgets.py:260 -msgid "Add Another" +#: contrib/admin/sites.py:42 +msgid "Site administration" msgstr "" -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ဖွင့်ဝင်" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "ပင်မ" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "ဆာဗာအမှားပြ" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "ဆာဗာအမှားပြ (၅၀၀)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "ဆာဗာအမှားပြ (၅၀၀)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "စကားဝှက်ပြောင်း" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" +msgid "Enter a new password for the user %(username)s." msgstr "" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "စကားဝှက်" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "ကြိုဆို၊ " -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "စာရွက်စာတမ်း" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "ဖွင့်ထွက်" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" -msgstr "" +msgstr "မှတ်တမ်း" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "စီစစ်မှု" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "ပယ်ဖျက်" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -476,30 +486,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -507,327 +517,296 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "ဖယ်ရှား" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" -msgstr "" +msgstr "ပြောင်းလဲ" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "စကားဝှက်:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" -msgstr "" +msgstr "အသုံးပြုသူ" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "စကားဝှက်" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "ဖယ်ရှား" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" -msgstr "" +msgstr "စကားဝှက်အဟောင်း" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" -msgstr "" +msgstr "စကားဝှက်အသစ်" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" -msgstr "" +msgstr "စကားဝှက်ပြောင်း" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "အီးမေးလ်လိပ်စာ:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/nb/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,14 +2,15 @@ # # Translators: # Jannis Leidel , 2011 -# jonklo , 2011-2012 +# Jon , 2014 +# Jon , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-28 11:16+0000\n" +"Last-Translator: Jon \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/" "language/nb/)\n" "MIME-Version: 1.0\n" @@ -18,12 +19,12 @@ "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Tilgjengelige %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +33,38 @@ "Dette er listen over tilgjengelige %s. Du kan velge noen ved å markere de i " "boksen under og så klikke på \"Velg\"-pilen mellom de to boksene." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Skriv i dette feltet for å filtrere ned listen av tilgjengelige %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Velg alle" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klikk for å velge alle %s samtidig" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Velg" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Slett" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Valgt %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,22 +73,24 @@ "Dette er listen over valgte %s. Du kan fjerne noen ved å markere de i boksen " "under og så klikke på \"Fjern\"-pilen mellom de to boksene." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Fjern alle" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klikk for å fjerne alle valgte %s samtidig" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s av %(cnt)s valgt" msgstr[1] "%(sel)s av %(cnt)s valgt" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -95,7 +98,8 @@ "Du har ulagrede endringer i individuelle felter. Hvis du utfører en " "handling, vil dine ulagrede endringer gå tapt." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +109,8 @@ "individuelle felter enda. Vennligst trykk OK for å lagre. Du må utføre " "handlingen på nytt." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +119,86 @@ "Du har valgt en handling, og har ikke gjort noen endringer i individuelle " "felter. Du ser mest sannsynlig etter Gå-knappen, ikke Lagre-knappen." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januar Februar Mars April Mai Juni Juli August September Oktober November " -"Desember" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T O T F L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Vis" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Skjul" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Merk: Du er %s time foran server-tid." +msgstr[1] "Merk: Du er %s timer foran server-tid." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Merk: Du er %s time bak server-tid." +msgstr[1] "Merk: Du er %s timer bak server-tid." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nå" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Klokke" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Velg et klokkeslett" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Midnatt" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "06:00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "12:00" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Avbryt" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "I dag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "I går" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "I morgen" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januar Februar Mars April Mai Juni Juli August September Oktober November " +"Desember" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T O T F L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Vis" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Skjul" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/nb/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/nb/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/nb/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/nb/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/nb/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,17 +2,17 @@ # # Translators: # Jannis Leidel , 2011 -# jensadne , 2013 -# jonklo , 2013 -# jonklo , 2011,2013 +# jensadne , 2013-2014 +# Jon , 2013 +# Jon , 2011,2013 # Sigurd Gartmann , 2012 -# injectedreality , 2013 +# Tommy Strand , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 12:00+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-30 08:03+0000\n" "Last-Translator: jensadne \n" "Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/django/" "language/nb/)\n" @@ -22,62 +22,68 @@ "Language: nb\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Slettet %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Kan ikke slette %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slett valgte %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administrasjon" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alle" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nei" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Ukjent" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Når som helst" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "I dag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Siste syv dager" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Denne måneden" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "I år" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -87,100 +93,97 @@ "administrasjonsbrukerkonto. Merk at det er forskjell på små og store " "bokstaver." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Økten din har tidsavbrutt, vennligst logg inn igjen." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Handling:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "tid for handling" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekt-ID" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekt-repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "handlingsflagg" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "endre melding" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "logginnlegg" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "logginnlegg" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "La til «%(object)s»." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Endret «%(object)s» - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Slettet «%(object)s»." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry-objekt" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ingen" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Endret %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "og" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Opprettet %(name)s «%(object)s»." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Endret %(list)s for %(name)s «%(object)s»." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Slettet %(name)s «%(object)s»." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ingen felt endret." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s «%(obj)s» ble lagt til. Du kan redigere videre nedenfor." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,19 +191,19 @@ msgstr "" "%(name)s \"%(obj)s\" ble lagt til. Du kan legge til en ny %(name)s nedenfor." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s «%(obj)s» ble lagt til." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "%(name)s \"%(obj)s\" ble endret. Du kan redigere videre nedenfor." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -208,12 +211,12 @@ msgstr "" "%(name)s \"%(obj)s\" ble endret. Du kan legge til en ny %(name)s nedenfor." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s «%(obj)s» ble endret." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -221,66 +224,66 @@ "Du må velge objekter for å utføre handlinger på dem. Ingen objekter har " "blitt endret." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ingen handling valgt." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Legg til ny %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s «%(obj)s» ble slettet." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primærnøkkelen %(key)r finnes ikke." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Legg til ny %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Endre %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Databasefeil" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ble endret." msgstr[1] "%(count)s %(name)s ble endret." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valgt" msgstr[1] "Alle %(total_count)s valgt" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 av %(cnt)s valgt" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s «%(obj)s» ble slettet." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Endringshistorikk: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -289,83 +292,71 @@ "Sletting av %(class_name)s «%(instance)s» krever sletting av følgende " "beskyttede relaterte objekter: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Logg inn" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administrasjonsside" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django-administrasjon" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Nettstedsadministrasjon" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s-administrasjon" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dato:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tid:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Oppslag" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Legg til ny" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Nåværende:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Logg inn" -#: widgets.py:303 -msgid "Change:" -msgstr "Endre:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s-administrasjon" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Fant ikke siden" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Beklager, men siden du spør etter finnes ikke." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Hjem" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Tjenerfeil" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Tjenerfeil (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Tjenerfeil (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -373,120 +364,141 @@ "Det har oppstått en feil. Feilen er blitt rapportert til administrator via e-" "post, og vil bli fikset snart. Takk for din tålmodighet." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Utfør den valgte handlingen" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Gå" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Trykk her for å velge samtlige objekter fra alle sider" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Velg alle %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Nullstill valg" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Skriv først inn brukernavn og passord. Deretter vil du få mulighet til å " +"endre flere brukerinnstillinger." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Skriv inn brukernavn og passord." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Endre passord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Vennligst korriger feilene under." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Vennligst korriger feilene under." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Skriv inn et nytt passord for brukeren %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Passord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Passord (gjenta)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Skriv inn det samme passordet som ovenfor, for verifisering." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Velkommen," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentasjon" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Endre passord" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Logg ut" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administrasjonsside" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django-administrasjon" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Legg til" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historikk" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Vis på nettsted" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Vennligst korriger feilene under." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Vennligst korriger feilene under." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Legg til ny %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrering" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Fjern fra sortering" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorteringsprioritet: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Slå av og på sortering" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Slett" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -497,7 +509,7 @@ "objekter slettes, men du har ikke tillatelse til å slette følgende " "objekttyper:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -506,7 +518,7 @@ "Sletting av %(object_name)s «%(escaped_object)s» krever sletting av følgende " "beskyttede relaterte objekter:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -515,16 +527,16 @@ "Er du sikker på at du vil slette %(object_name)s «%(escaped_object)s»? Alle " "de følgende relaterte objektene vil bli slettet:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, jeg er sikker" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Slett flere objekter" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -535,7 +547,7 @@ "relaterte objekter, men kontoen din har ikke tillatelse til å slette " "følgende objekttyper:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -544,7 +556,7 @@ "Sletting av det valgte %(objects_name)s ville kreve sletting av følgende " "beskyttede relaterte objekter:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -553,41 +565,56 @@ "Er du sikker på vil slette det valgte %(objects_name)s? De følgende " "objektene og deres relaterte objekter vil bli slettet:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Fjern" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Legg til ny %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Slette?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Etter %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modeller i %(name)s-applikasjonen" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Endre" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Du har ikke rettigheter til å redigere noe." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Siste handlinger" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mine handlinger" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ingen tilgjengelige" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Ukjent innhold" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -596,27 +623,27 @@ "Noe er galt med databaseinstallasjonen din. Sørg for at databasetabellene er " "opprettet og at brukeren har de nødvendige rettighetene." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Passord:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Glemt brukernavnet eller passordet ditt?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dato/tid" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Bruker" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Handling" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -624,112 +651,61 @@ "Dette objektet har ingen endringshistorikk. Det ble sannsynligvis ikke lagt " "til på denne administrasjonssiden." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Vis alle" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Lagre" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Søk" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultat" msgstr[1] "%(counter)s resultater" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s totalt" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Lagre som ny" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Lagre og legg til ny" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Lagre og fortsett å redigere" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Skriv først inn brukernavn og passord. Deretter vil du få mulighet til å " -"endre flere brukerinnstillinger." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Skriv inn brukernavn og passord." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Skriv inn et nytt passord for brukeren %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Passord" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Passord (gjenta)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Skriv inn det samme passordet som ovenfor, for verifisering." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Fjern" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Legg til ny %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Slette?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Takk for i dag." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Logg inn igjen" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Endre passord" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Passord endret" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ditt passord ble endret." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -737,65 +713,49 @@ "Av sikkerhetsgrunner må du oppgi ditt gamle passord. Deretter oppgir du det " "nye passordet ditt to ganger, slik at vi kan kontrollere at det er korrekt." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Gammelt passord" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nytt passord" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Endre passord" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Nullstill passord" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Passord nullstilt" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Passordet ditt er satt. Du kan nå logge inn." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Bekreftelse på nullstilt passord" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Oppgi nytt passord" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" "Oppgi det nye passordet to ganger, for å sikre at det er skrevet korrekt." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nytt passord:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Gjenta nytt passord:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Passordet ble ikke nullstilt" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -803,12 +763,7 @@ "Nullstillingslenken er ugyldig, kanskje fordi den allerede har vært brukt. " "Vennligst nullstill passordet ditt på nytt." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Passord-nullstilling klar" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -816,7 +771,7 @@ "Vi har sendt deg en e-post med instruksjoner for nullstilling av passord. Du " "bør motta den om kort tid." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -824,7 +779,7 @@ "Hvis du ikke mottar en epost, sjekk igjen at du har oppgitt den adressen du " "er registrert med og sjekk ditt spam filter." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -833,24 +788,24 @@ "Du mottar denne e-posten fordi du har bedt om nullstilling av passordet ditt " "på %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Vennligst gå til følgende side og velg et nytt passord:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Brukernavnet ditt, i tilfelle du har glemt det:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Takk for at du bruker siden vår!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Hilsen %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -858,28 +813,52 @@ "Glemt passordet ditt? Oppgi e-postadressen din under, så sender vi deg en e-" "post med instruksjoner for nullstilling av passord." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-postadresse:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Nullstill mitt passord" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alle datoer" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ingen)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Velg %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Velg %s du ønsker å endre" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dato:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tid:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Oppslag" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Legg til ny" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Nåværende:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Endre:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ne/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # Sagar Chalise , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/" "ne/)\n" "MIME-Version: 1.0\n" @@ -18,12 +18,12 @@ "Language: ne\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "उपलब्ध %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "यो उपलब्ध %s को सुची हो। तपाईंले यी मध्य केही बक्सबाट चयन गरी बक्स बीच्को \"छान्नुहोस " "\" तीरमा क्लिक गरी छान्नसक्नुहुन्छ । " -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr " उपलब्ध %s को सुचिबाट छान्न यो बक्समा टाइप गर्नुहोस " -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "छान्नुहोस" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "सबै छान्नुहोस " -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "एकै क्लिकमा सबै %s छान्नुहोस " -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "छान्नुहोस " -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "हटाउनुहोस" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "छानिएको %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,28 +72,31 @@ "यो छानिएका %s को सुची हो । तपाईंले यी मध्य केही बक्सबाट चयन गरी बक्स बीच्को " "\"हटाउनुहोस\" तीरमा क्लिक गरी हटाउन सक्नुहुन्छ । " -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "सबै हटाउनुहोस " -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "एकै क्लिकमा सबै छानिएका %s हटाउनुहोस ।" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s को %(sel)s चयन गरियो" msgstr[1] "%(cnt)s को %(sel)s चयन गरियो" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "तपाइको फेरबदल बचत भएको छैन । कार्य भएमा बचत नभएका फेरबदल हराउने छन् ।" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -102,7 +105,8 @@ "तपाइले कार्य छाने पनि फेरबदलहरु बचत गर्नु भएको छैन । कृपया बचत गर्न हुन्छ थिच्नुहोस । कार्य " "पुन: सञ्चालन गर्नुपर्नेछ ।" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -111,68 +115,84 @@ "तपाइले कार्य छाने पनि फाँटहरुमा फेरबदलहरु गर्नु भएको छैन । बचत गर्नु भन्दा पनि अघि बढ्नुहोस " "।" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "जनवरी फेब्रुअरी मार्च अप्रिल मई जुन जुलै अगस्त सेप्टेम्बर अक्टुवर नभम्वर डिसम्वर" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "आइत सोम मंगल बुध बिही शुक्र शनि" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "देखाउनुहोस " - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "लुकाउनुहोस " +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "यतिखेर" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "घडी" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "समय चयन गर्नुहोस" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "मध्यरात" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "बिहान ६ बजे" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "मध्यान्ह" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "रद्द गर्नुहोस " -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "आज" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "पात्रो " -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "हिजो" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "भोलि" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "जनवरी फेब्रुअरी मार्च अप्रिल मई जुन जुलै अगस्त सेप्टेम्बर अक्टुवर नभम्वर डिसम्वर" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "आइत सोम मंगल बुध बिही शुक्र शनि" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "देखाउनुहोस " + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "लुकाउनुहोस " Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ne/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ne/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ne/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ne/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ne/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ne/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Sagar Chalise , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-22 01:20+0000\n" -"Last-Translator: Sagar Chalise \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Nepali (http://www.transifex.com/projects/p/django/language/" "ne/)\n" "MIME-Version: 1.0\n" @@ -17,62 +17,68 @@ "Language: ne\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "सफलतापूर्वक मेटियो %(count)d %(items)s ।" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s मेट्न सकिएन " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "के तपाई पक्का हुनुहुन्छ ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "%(verbose_name_plural)s छानिएको मेट्नुहोस" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "सबै" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "हो" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "होइन" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "अज्ञात" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "कुनै मिति" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "आज" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "पूर्व ७ दिन" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "यो महिना" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "यो साल" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -81,101 +87,98 @@ "कृपया स्टाफ खाताको लागि सही %(username)s र पासवर्ड राख्नु होस । दुवै खाली ठाउँ केस " "सेन्सिटिव हुन सक्छन् ।" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "कृपया पुन: लगिन गर्नुहोस, किनकी तपाइको अवधि सिद्धिएको छ ।" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "कार्य:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "कार्य समय" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "वस्तु परिचय" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "एक्सन फ्ल्याग" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "सन्देश परिवर्तन गर्नुहोस" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "लग" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "लगहरु" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr " \"%(object)s\" थपिएको छ ।" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" - %(changes)s फेरियो ।" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" मेटिएको छ ।" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "लग ईन्ट्री वस्तु" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "शुन्य" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s परिवर्तित ।" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "र" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" थपिएको छ ।" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s को %(list)s फेरियो ।" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" मेटिएको छ ।" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "कुनै फाँट फेरिएन ।" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" सफलतापूर्वक थप भयो । तपाई यो पुन: संशोधन गर्न सक्नुहुनेछ ।" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -183,12 +186,12 @@ msgstr "" "%(name)s \"%(obj)s\" सफलता पूर्वक थप भयो । तपाई अर्को %(name)s तल राख्न सक्नु हुनेछ।" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक परिवर्तन भयो । " -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -197,7 +200,7 @@ "%(name)s \"%(obj)s\" सफलता पूर्वक फेर बदल भयो । तपाई तल यो पुन: संशोधन गर्न सक्नु " "हुनेछ ।" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -206,160 +209,148 @@ "%(name)s \"%(obj)s\" सफलता पूर्वक फेर बदल भयो । तपाई अर्को %(name)s तल राख्न सक्नु " "हुनेछ।" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक परिवर्तन भयो । " -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "कार्य गर्नका निम्ति वस्तु छान्नु पर्दछ । कुनैपनि छस्तु छानिएको छैन । " -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "कार्य छानिएको छैन ।" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s थप्नुहोस" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक मेटियो । " -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "प्राइमरी की %(key)r भएको %(name)s अब्जेक्ट" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s थप्नुहोस" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s परिवर्तित ।" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "डाटाबेस त्रुटि" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s सफलतापूर्वक परिवर्तन भयो ।" msgstr[1] "%(count)s %(name)sहरु सफलतापूर्वक परिवर्तन भयो ।" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s चयन भयो" msgstr[1] "सबै %(total_count)s चयन भयो" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s को ० चयन गरियो" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" सफलतापूर्वक मेटियो । " - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "इतिहास फेर्नुहोस : %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "लगिन" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ज्याङ्गो साइट प्रशासन" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ज्याङ्गो प्रशासन" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "साइट प्रशासन" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s प्रशासन" - -#: widgets.py:90 -msgid "Date:" -msgstr "मिति:" - -#: widgets.py:91 -msgid "Time:" -msgstr "समय:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "खोज तलास" - -#: widgets.py:260 -msgid "Add Another" -msgstr "अर्को थप्नुहोस" - -#: widgets.py:302 -msgid "Currently:" -msgstr "अहिले :" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "लगिन" -#: widgets.py:303 -msgid "Change:" -msgstr "फेर्नु होस :" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "पृष्ठ भेटिएन" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "क्षमापार्थी छौं तर अनुरोध गरिएको पृष्ठ भेटिएन ।" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "गृह" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "सर्भर त्रुटि" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "सर्भर त्रुटि (५००)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "सर्भर त्रुटि (५००)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -367,120 +358,141 @@ "त्रुटी भयो । साइट प्रशासकलाई ई-मेलबाट खबर गरिएको छ र चाँडै समाधान हुनेछ । धैर्यताको " "लागि धन्यवाद ।" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "छानिएको कार्य गर्नुहोस ।" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "बढ्नुहोस" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "सबै पृष्ठभरमा वस्तु छान्न यहाँ थिच्नुहोस ।" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "%(total_count)s %(module_name)s सबै छान्नुहोस " -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "चुनेको कुरा हटाउनुहोस ।" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"सर्वप्रथम प्रयोगकर्ता नाम र पासवर्ड हाल्नुहोस । अनिपछि तपाइ प्रयोगकर्ताका विकल्पहरु " +"संपादन गर्न सक्नुहुनेछ ।" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "प्रयोगकर्ता नाम र पासवर्ड राख्नुहोस।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "पासवर्ड फेर्नुहोस " + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "कृपया तलका त्रुटिहरु सच्याउनुहोस ।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "कृपया तलका त्रुटी सुधार्नु होस ।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "प्रयोगकर्ता %(username)s को लागि नयाँ पासवर्ड राख्नुहोस ।" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "पासवर्ड" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "पासवर्ड (पुन:)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "प्रमाणिकरणको लागि माथी कै पासवर्ड राख्नुहोस ।" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "स्वागतम्" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "विस्तृत विवरण" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "पासवर्ड फेर्नुहोस " - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "लग आउट" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ज्याङ्गो साइट प्रशासन" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ज्याङ्गो प्रशासन" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "थप्नुहोस " -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "इतिहास" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "साइटमा हेर्नुहोस" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "कृपया तलका त्रुटिहरु सच्याउनुहोस ।" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "कृपया तलका त्रुटी सुधार्नु होस ।" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s थप्नुहोस" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "छान्नुहोस" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "मेट्नुहोस" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -488,30 +500,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "हुन्छ, म पक्का छु ।" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "वहु वस्तुहरु मेट्नुहोस ।" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -519,55 +531,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "%(objects_name)s " -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "हटाउनुहोस" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "अर्को %(verbose_name)s थप्नुहोस ।" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "मेट्नुहुन्छ ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s द्वारा" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s एप्लिकेसनमा भएको मोडेलहरु" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "फेर्नुहोस" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "तपाइलाई केही पनि संपादन गर्ने अनुमति छैन ।" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "हालैका कार्यहरु" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "मेरो कार्यहरु" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "कुनै पनि उपलब्ध छैन ।" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "अज्ञात सामग्री" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -576,138 +603,87 @@ "डाटाबेस स्थापनामा केही त्रुटी छ । सम्वद्ध टेबल बनाएको र प्रयोगकर्तालाई डाटाबेसमा अनुमति " "भएको छ छैन जाच्नुहोस ।" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "पासवर्ड" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "पासवर्ड अथवा प्रयोगकर्ता नाम भुल्नुभयो ।" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "मिति/समय" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "प्रयोगकर्ता" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "कार्य:" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "यो अब्जेक्टको पुर्व परिवर्तन छैन । यो यस " -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "सबै देखाउनुहोस" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "बचत गर्नुहोस" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "खोज्नुहोस" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s नतिजा" msgstr[1] "%(counter)s नतिजाहरु" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "जम्मा %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "नयाँ रुपमा बचत गर्नुहोस" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "बचत गरेर अर्को थप्नुहोस" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "बचत गरेर संशोधन जारी राख्नुहोस" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"सर्वप्रथम प्रयोगकर्ता नाम र पासवर्ड हाल्नुहोस । अनिपछि तपाइ प्रयोगकर्ताका विकल्पहरु " -"संपादन गर्न सक्नुहुनेछ ।" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "प्रयोगकर्ता नाम र पासवर्ड राख्नुहोस।" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "प्रयोगकर्ता %(username)s को लागि नयाँ पासवर्ड राख्नुहोस ।" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "पासवर्ड" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "पासवर्ड (पुन:)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "प्रमाणिकरणको लागि माथी कै पासवर्ड राख्नुहोस ।" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "हटाउनुहोस" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "अर्को %(verbose_name)s थप्नुहोस ।" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "मेट्नुहुन्छ ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "वेब साइटमा समय बिताउनु भएकोमा धन्यवाद ।" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "पुन: लगिन गर्नुहोस" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "पासवर्ड फेरबदल" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "पासवर्ड सफलतापूर्वक फेरिएको छ ।" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "तपाइको पासवर्ड फेरिएको छ ।" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -715,81 +691,60 @@ "सुरक्षाको निम्ति आफ्नो पुरानो पासवर्ड राख्नुहोस र कृपया दोहर्याएर आफ्नो नयाँ पासवर्ड " "राख्नुहोस ताकी प्रमाणीकरण होस । " -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "पुरानो पासवर्ड" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "नयाँ पासवर्ड" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "मेरो पासवर्ड फेर्नुहोस " -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "पासवर्डपून: राख्नुहोस । " -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "पासवर्डपुन: राख्ने कार्य सम्पन्न भयो ।" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "तपाइको पासवर्ड राखियो । कृपया लगिन गर्नुहोस ।" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "पासवर्ड पुनर्स्थापना पुष्टि" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "नयाँ पासवर्ड राख्नुहोस" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "ठीक तरिकाले राखिएको पुष्टि गर्न कृपया नयाँ पासवर्ड दोहोर्याएर राख्नुहोस ।" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "नयाँ पासवर्ड :" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "पासवर्ड पुष्टि:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "पासवर्ड पुन: राख्ने काम असफल भयो ।" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "पासवर्ड पुनर्स्थापना प्रयोग भइसकेको छ । कृपया नयाँ पासवर्ड रिसेट माग्नुहोस ।" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "सफलतापूर्वक पासवर्ड पुन: राखियो ।" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "पासवर्ड मिलाउने तरिका ई-मेल गरेका छौँ । " -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -797,7 +752,7 @@ "ई-मेल नपाइए मा कृपया ई-मेल ठेगाना सही राखेको नराखेको जाँच गर्नु होला र साथै आफ्नो ई-" "मेलको स्प्याम पनि जाँच गर्नु होला ।" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -805,52 +760,76 @@ msgstr "" " %(site_name)s को लागि तपाइले पासवर्ड पुन: राख्न आग्रह गरेको हुनाले ई-मेल पाउनुहुदैंछ । " -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "कृपया उक्त पृष्ठमा जानुहोस र नयाँ पासवर्ड राख्नुहोस :" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "तपाइको प्रयोगकर्ता नाम, बिर्सनुभएको भए :" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "हाम्रो साइट प्रयोग गरेकोमा धन्यवाद" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s टोली" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" "पासवर्ड बिर्सनु भयो ? तल ई-मेल दिनु होस र हामी नयाँ पासवर्ड हाल्ने प्रकृया पठाइ दिनेछौँ ।" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "ई-मेल ठेगाना :" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "मेरो पासवर्ड पुन: राख्नुहोस ।" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "सबै मिति" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(शुन्य)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s छान्नुहोस" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s परिवर्तन गर्न छान्नुहोस ।" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "मिति:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "समय:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "खोज तलास" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "अर्को थप्नुहोस" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "अहिले :" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "फेर्नु होस :" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/nl/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # wunki , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-10-30 08:16+0000\n" -"Last-Translator: Bouke Haarsma \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-15 06:54+0000\n" +"Last-Translator: Jeffrey Gelens \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/" "nl/)\n" "MIME-Version: 1.0\n" @@ -21,12 +21,12 @@ "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Beschikbare %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -36,38 +36,38 @@ "selecteren in het vak hieronder en vervolgens op de \"Kiezen\" pijl tussen " "de twee lijsten te klikken." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Type in dit vak om te filteren in de lijst met beschikbare %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Kies alle" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klik om alle %s te kiezen." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Kiezen" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Verwijderen" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Gekozen %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -77,22 +77,24 @@ "selecteren in het vak hieronder en vervolgens op de \"Verwijderen\" pijl " "tussen de twee lijsten te klikken." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Verwijder alles" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klik om alle gekozen %s tegelijk te verwijderen." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s van de %(cnt)s geselecteerd" msgstr[1] "%(sel)s van de %(cnt)s geselecteerd" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -100,7 +102,8 @@ "U heeft niet opgeslagen wijzigingen op enkele indviduele velden. Als u nu " "een actie uitvoert zullen uw wijzigingen verloren gaan." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -110,7 +113,8 @@ "velden nog niet opgeslagen. Klik alstublieft op OK om op te slaan. U zult " "vervolgens de actie opnieuw moeten uitvoeren." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -120,70 +124,86 @@ "individuele velden. U zoekt waarschijnlijk naar de Gaan knop in plaats van " "de Opslaan knop." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"januari februari maart april mei juni juli augustus september oktober " -"november december" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Z M D W D V Z" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Tonen" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Verbergen" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nu" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Klok" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Kies een tijd" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Middernacht" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "Zes uur 's ochtends" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Twaalf uur 's middags" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Annuleren" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Vandaag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Gisteren" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Morgen" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"januari februari maart april mei juni juli augustus september oktober " +"november december" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Z M D W D V Z" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Tonen" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Verbergen" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/nl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/nl/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/nl/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/nl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/nl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # Tino de Bruijn , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-23 17:46+0000\n" -"Last-Translator: Bas Peschier \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-15 06:53+0000\n" +"Last-Translator: Jeffrey Gelens \n" "Language-Team: Dutch (http://www.transifex.com/projects/p/django/language/" "nl/)\n" "MIME-Version: 1.0\n" @@ -21,62 +21,68 @@ "Language: nl\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s succesvol verwijderd." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s kan niet worden verwijderd " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Weet u het zeker?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Verwijder geselecteerde %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alle" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nee" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Onbekend" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Elke datum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Vandaag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Afgelopen zeven dagen" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Deze maand" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Dit jaar" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,100 +91,97 @@ "Voer de correcte %(username)s en wachtwoord voor een stafaccount in. Let op " "dat beide velden hoofdlettergevoelig zijn." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Uw sessie is verlopen, meld u opnieuw aan." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Actie:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "actietijd" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "object-id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "object-repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "actievlag" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "wijzig bericht" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "logregistratie" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "logregistraties" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Toegevoegd \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Gewijzigd \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Verwijderd \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry Object" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Geen" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s gewijzigd." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "en" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" toegevoegd." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s aangepast voor %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" verwijderd." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Geen velden gewijzigd." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "De %(name)s \"%(obj)s\" was toegevoegd. U kunt het hieronder wijzigen." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +190,12 @@ "De %(name)s \"%(obj)s\" was succesvol gewijzigd. Je kan hieronder een andere " "%(name)s toevoegen." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "De %(name)s \"%(obj)s\" is toegevoegd." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ "De %(name)s \"%(obj)s\" was succesvol gewijzigd. Je kunt het hieronder " "wijzigen." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "De %(name)s \"%(obj)s\" was succesvol gewijzigd. Je kan hieronder een andere " "%(name)s toevoegen." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Het wijzigen van %(name)s \"%(obj)s\" is geslaagd." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,66 +226,66 @@ "Er moeten items worden geselecteerd om acties op uit te voeren. Geen items " "zijn veranderd." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Geen actie geselecteerd." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Toevoegen %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Gebruiker %(name)s \"%(obj)s\" is verwijderd." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s object met primaire sleutel %(key)r bestaat niet." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Toevoegen %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Wijzig %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Databasefout" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s is succesvol gewijzigd." msgstr[1] "%(count)s %(name)s zijn succesvol gewijzigd." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s geselecteerd" msgstr[1] "Alle %(total_count)s geselecteerd" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 van de %(cnt)s geselecteerd" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Gebruiker %(name)s \"%(obj)s\" is verwijderd." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Wijzigingsgeschiedenis: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -291,83 +294,71 @@ "Het verwijderen van %(class_name)s %(instance)s vereist het verwijderen van " "de volgende beschermde gerelateerde objecten: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Inloggen" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django sitebeheer" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Djangobeheer" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Sitebeheer" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s beheer" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tijd:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Opzoeken" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Voeg nog één toe" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Huidig:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Inloggen" -#: widgets.py:303 -msgid "Change:" -msgstr "Wijzig:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Pagina niet gevonden" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Onze excuses, maar de gevraagde pagina bestaat niet." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Voorpagina" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serverfout" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serverfout (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serverfout (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -376,120 +367,142 @@ "website administrators en zou snel verholpen moeten zijn. Bedankt voor uw " "geduld." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Voer de geselecteerde actie uit" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Voer Uit" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klik hier om alle objecten op alle pagina's te selecteren" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Selecteer alle %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Leeg selectie" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Vul allereerst een gebruikersnaam en wachtwoord in. Vervolgens kunt u de " +"andere opties instellen." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Voer een gebruikersnaam en wachtwoord in." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Wachtwoord wijzigen" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Herstel de fouten hieronder." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Herstel de fouten hieronder." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Geef een nieuw wachtwoord voor gebruiker %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Wachtwoord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Wachtwoord (nogmaals)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Welkom," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentatie" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Wachtwoord wijzigen" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Afmelden" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django sitebeheer" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Djangobeheer" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Toevoegen" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Geschiedenis" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Toon op site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Herstel de fouten hieronder." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Herstel de fouten hieronder." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s toevoegen" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Verwijder uit de sortering" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorteer prioriteit: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Sortering aan/uit" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Verwijderen" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -500,7 +513,7 @@ "gerelateerde objecten verwijderen. Echter u heeft geen rechten om de " "volgende typen objecten te verwijderen:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -509,7 +522,7 @@ "Het verwijderen van %(object_name)s '%(escaped_object)s' vereist het " "verwijderen van de volgende gerelateerde objecten:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -518,16 +531,16 @@ "Weet u zeker dat u %(object_name)s \"%(escaped_object)s\" wilt verwijderen? " "Alle volgende objecten worden verwijderd:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, ik weet het zeker" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Verwijder meerdere objecten" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -538,7 +551,7 @@ "verwijderen van gerelateerde objecten, maar uw account heeft geen " "toestemming om de volgende soorten objecten te verwijderen:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -547,7 +560,7 @@ "Het verwijderen van de geselecteerde %(objects_name)s vereist het " "verwijderen van de volgende beschermde gerelateerde objecten:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -556,41 +569,56 @@ "Weet u zeker dat u de geselecteerde %(objects_name)s wilt verwijderen? Alle " "volgende objecten en hun aanverwante items zullen worden verwijderd:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Verwijderen" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Voeg nog een %(verbose_name)s toe" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Verwijderen?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Op %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modellen in de %(name)s applicatie" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Wijzigen" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "U heeft geen rechten om iets te wijzigen." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Recente acties" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mijn acties" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Geen beschikbaar" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Onbekende inhoud" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -599,27 +627,27 @@ "Er is iets mis met de database. Verzeker u ervan dat de benodigde tabellen " "zijn aangemaakt en dat de database toegankelijk is voor de juiste gebruiker." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Wachtwoord:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Wachtwoord of gebruikersnaam vergeten?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/tijd" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Gebruiker" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Actie" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -627,113 +655,61 @@ "Dit object heeft geen wijzigingsgeschiedenis. Het is mogelijk niet via de " "beheersite toegevoegd." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Alles tonen" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Opslaan" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Zoek" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultaat" msgstr[1] "%(counter)s resultaten" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s totaal" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Opslaan als nieuw item" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Opslaan en nieuwe toevoegen" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Opslaan en opnieuw bewerken" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Vul allereerst een gebruikersnaam en wachtwoord in. Vervolgens kunt u de " -"andere opties instellen." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Voer een gebruikersnaam en wachtwoord in." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Geef een nieuw wachtwoord voor gebruiker %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Wachtwoord" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Wachtwoord (nogmaals)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Vul hetzelfde wachtwoord als hierboven in, ter bevestiging." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Verwijderen" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Voeg nog een %(verbose_name)s toe" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Verwijderen?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Bedankt voor de aanwezigheid op de site vandaag." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Log opnieuw in" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Wachtwoordwijziging" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Wachtwoord wijzigen is geslaagd" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Uw wachtwoord is gewijzigd." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -741,46 +717,34 @@ "Vanwege de beveiliging moet u uw oude en twee keer uw nieuwe wachtwoord " "invoeren, zodat we kunnen controleren of er geen typefouten zijn gemaakt." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Oud wachtwoord" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nieuw wachtwoord" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Wijzig mijn wachtwoord" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Wachtwoord hersteld" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Wachtwoord herstellen voltooid" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Uw wachtwoord is ingesteld. U kunt nu verder gaan en inloggen." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Bevestiging wachtwoord herstellen" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Voer nieuw wachtwoord in" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -788,19 +752,15 @@ "Voer het nieuwe wachtwoord twee keer in, zodat we kunnen controleren of er " "geen typefouten zijn gemaakt." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nieuw wachtwoord:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Bevestig wachtwoord:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Wachtwoord herstel mislukt" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -808,12 +768,7 @@ "De link voor het herstellen van het wachtwoord is ongeldig, waarschijnlijk " "omdat de link al eens is gebruikt. Vraag opnieuw een wachtwoord aan." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Wachtwoord herstel geslaagd" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -821,7 +776,7 @@ "We hebben u instructies voor het instellen van uw wachtwoord gemaild. U zou " "deze binnenkort moeten ontvangen." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -829,7 +784,7 @@ "Als u geen e-mail ontvangt, controleer dan of u het e-mailadres hebt " "opgegeven waar u zich mee geregistreerd heeft en controleer uw spam-map." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -838,24 +793,24 @@ "U ontvangt deze email omdat u heeft verzocht het wachtwoord te resetten voor " "uw account op %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Gaat u naar de volgende pagina en kies een nieuw wachtwoord:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Uw gebruikersnaam, mocht u deze vergeten zijn:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Bedankt voor het gebruik van onze site!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Het %(site_name)s team" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -863,28 +818,52 @@ "Wachtwoord vergeten? Vul uw emailadres hieronder in, en we zullen " "instructies voor het opnieuw instellen van uw wachtwoord mailen." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Emailadres:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Herstel mijn wachtwoord" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alle data" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Geen)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Selecteer %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Selecteer %s om te wijzigen" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tijd:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Opzoeken" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Voeg nog één toe" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Huidig:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Wijzig:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/nn/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -6,11 +6,11 @@ # velmont , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/" "language/nn/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Tilgjengelege %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "Dette er lista over tilgjengelege %s. Du kan velja nokon ved å markera dei i " "boksen under og so klikka på «Velg»-pila mellom dei to boksane." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Skriv i dette feltet for å filtrera ned lista av tilgjengelege %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Velg alle" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klikk for å velja alle %s samtidig." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Vel" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Slett" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Valde %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "Dette er lista over valte %s. Du kan fjerna nokon ved å markera dei i boksen " "under og so klikka på «Fjern»-pila mellom dei to boksane." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Fjern alle" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klikk for å fjerna alle valte %s samtidig." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s av %(cnt)s vald" msgstr[1] "%(sel)s av %(cnt)s valde" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "Det er endringar som ikkje er lagra i individuelt redigerbare felt. " "Endringar som ikkje er lagra vil gå tapt." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "Du har vald ei handling, men du har framleis ikkje lagra endringar for " "individuelle felt. Klikk OK for å lagre. Du må gjere handlinga på nytt." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +118,86 @@ "Du har vald ei handling og du har ikkje gjort endringar i individuelle felt. " "Du ser sannsynlegvis etter Gå vidare-knappen - ikkje Lagre-knappen." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januar Februar Mars April Mai Juni Juli August September Oktober November " -"Desember" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T O T F L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Vis" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Skjul" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "No" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Klokke" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Velg eit klokkeslett" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Midnatt" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "06:00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "12:00" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Avbryt" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "I dag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "I går" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "I morgon" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januar Februar Mars April Mai Juni Juli August September Oktober November " +"Desember" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T O T F L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Vis" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Skjul" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/nn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/nn/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/nn/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/nn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/nn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -8,11 +8,11 @@ # velmont , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-06 12:01+0000\n" -"Last-Translator: jensadne \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Norwegian Nynorsk (http://www.transifex.com/projects/p/django/" "language/nn/)\n" "MIME-Version: 1.0\n" @@ -21,193 +21,196 @@ "Language: nn\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Sletta %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Kan ikkje slette %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Er du sikker?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Slett valgte %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alle" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nei" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Ukjend" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Når som helst" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "I dag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Siste sju dagar" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Denne månaden" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "I år" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Økta har tidsavbrot, logg inn att." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Handling:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "tid for handling" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objekt-ID" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objekt repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "handlingsflagg" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "endre melding" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "logginnlegg" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "logginnlegg" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "La til «%(object)s»." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Endra «%(object)s» - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Sletta «%(object)s»." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry-objekt" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ingen" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Endra %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "og" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Oppretta %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Endra %(list)s for %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Sletta %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ingen felt endra." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" vart endra Du kan redigere vidare nedanfor." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" vart oppretta." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" vart endra." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -215,66 +218,66 @@ "Objekt må vere valde for at dei skal kunne utførast handlingar på. Ingen " "object er endra." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Inga valt handling." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Opprett %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" vart sletta." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primærnøkkelen %(key)r eksisterer ikkje." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Opprett %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Rediger %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Databasefeil" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s vart endra." msgstr[1] "%(count)s %(name)s vart endra." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s valde" msgstr[1] "Alle %(total_count)s valde" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Ingen av %(cnt)s valde" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" vart sletta." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Endringshistorikk: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -283,202 +286,211 @@ "Sletting av %(class_name)s «%(instance)s» krev sletting av følgande beskytta " "relaterte objekt: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Logg inn" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administrasjonsside" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django-administrasjon" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Nettstadsadministrasjon" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s-administrasjon" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dato:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tid:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Oppslag" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Legg til ny" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Logg inn" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Fann ikkje sida" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Sida du spør etter finst ikkje." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Heim" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Tenarfeil" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Tenarfeil (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Tenarfeil (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Utfør den valde handlinga" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Gå" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klikk her for å velje objekt på tvers av alle sider" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Velg alle %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Nullstill utval" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Skriv først inn brukernamn og passord. Deretter vil du få høve til å endre " +"fleire brukarinnstillingar." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Skriv inn nytt brukarnamn og passord." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Endre passord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Korriger feila under." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Skriv inn eit nytt passord for brukaren %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Passord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Passord (gjenta)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Skriv inn det samme passordet som over, for verifisering." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Velkommen," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentasjon" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Endre passord" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Logg ut" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administrasjonsside" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django-administrasjon" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Opprett" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historikk" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Vis på nettstad" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Korriger feila under." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Opprett %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrering" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Fjern frå sortering" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorteringspriorite: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Slår av eller på sortering" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Slett" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -488,7 +500,7 @@ "Dersom du slettar %(object_name)s '%(escaped_object)s', vil også slette " "relaterte objekt, men du har ikkje løyve til å slette følgande objekttypar:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -497,7 +509,7 @@ "Sletting av %(object_name)s '%(escaped_object)s' krevar sletting av " "følgjande beskytta relaterte objekt:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -506,16 +518,16 @@ "Er du sikker på at du vil slette %(object_name)s \"%(escaped_object)s\"? " "Alle dei følgjande relaterte objekta vil bli sletta:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, eg er sikker" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Slett fleire objekt" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -525,7 +537,7 @@ "Sletting av %(objects_name)s vil føre til at relaterte objekt blir sletta, " "men kontoen din manglar løyve til å slette følgjande objekttypar:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -534,7 +546,7 @@ "Sletting av %(objects_name)s krevar sletting av følgjande beskytta relaterte " "objekt:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -543,41 +555,56 @@ "Er du sikker på at du vil slette dei valgte objekta %(objects_name)s? " "Følgjande objekt og deira relaterte objekt vil bli sletta:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Fjern" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Legg til ny %(verbose_name)s." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Slette?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Etter %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Endre" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Du har ikkje løyve til å redigere noko." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Siste handlingar" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mine handlingar" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ingen tilgjengelege" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Ukjent innhald" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -586,27 +613,27 @@ "Noko er gale med databaseinstallasjonen din. Syt for at databasetabellane er " "oppretta og at brukaren har dei naudsynte løyve." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Passord:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Gløymd brukarnamn eller passord?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dato/tid" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Brukar" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Handling" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -614,112 +641,61 @@ "Dette objektet har ingen endringshistorikk. Det var sannsynlegvis ikkje " "oppretta med administrasjonssida." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Vis alle" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Lagre" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Søk" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultat" msgstr[1] "%(counter)s resultat" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s totalt" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Lagre som ny" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Lagre og opprett ny" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Lagre og hald fram å redigere" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Skriv først inn brukernamn og passord. Deretter vil du få høve til å endre " -"fleire brukarinnstillingar." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Skriv inn nytt brukarnamn og passord." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Skriv inn eit nytt passord for brukaren %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Passord" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Passord (gjenta)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Skriv inn det samme passordet som over, for verifisering." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Fjern" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Legg til ny %(verbose_name)s." - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Slette?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Takk for at du brukte kvalitetstid på nettstaden i dag." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Logg inn att" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Endre passord" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Passord endra" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Passordet ditt vart endret." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -727,46 +703,34 @@ "Av sikkerheitsgrunnar må du oppgje det gamle passordet ditt. Oppgje så det " "nye passordet ditt to gonger, slik at vi kan kontrollere at det er korrekt." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Gammalt passord" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nytt passord" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Endre passord" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Nullstill passord" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Passord nullstilt" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Passordet ditt er sett. Du kan logge inn." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Stadfesting på nullstilt passord" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Oppgje nytt passord" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -774,19 +738,15 @@ "Oppgje det nye passordet ditt to gonger, for å sikre at du oppgjev det " "korrekt." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nytt passord:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Gjenta nytt passord:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Passordet vart ikkje nullstilt" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -794,75 +754,94 @@ "Nullstillingslinken er ugyldig, kanskje fordi den allereie har vore brukt. " "Nullstill passordet ditt på nytt." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Passordet vart nullstilt" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Gå til følgjande side og velg eit nytt passord:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Brukarnamnet ditt, i tilfelle du har gløymt det:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Takk for at du brukar sida vår!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Helsing %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Nullstill passordet" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alle datoar" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ingen)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Velg %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Velg %s du ønskar å redigere" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dato:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tid:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Oppslag" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Legg til ny" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/os/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,14 +1,14 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Soslan Khubulov , 2013 +# Xwybylty Soslan , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/" "os/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ "Language: os\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Уӕвӕг %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "бындӕр къӕртты ӕмӕ дыууӕ къӕртты ӕхсӕн \"Равзарын\"-ы ӕгънӕгыл куы ныххӕцай, " "уӕд." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Бафысс ацы къӕртты, уӕвӕг %s-ты номхыгъд фӕрсудзынӕн." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Фӕрсудзӕн" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Равзарын алкӕцыдӕр" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Ныххӕц, алы %s равзарынӕн." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Равзарын" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Схафын" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Ӕвзӕрст %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -72,22 +72,24 @@ "Ай у ӕвзӕрст %s-ты номхыгъд. Сӕ хафынӕн сӕ дӕ бон у бындӕр къӕртты равзарын " "ӕмӕ дыууӕ ӕгънӕджы ӕхсӕн \"Схфын\"-ыл ныххӕцын." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Схафын алкӕцыдӕр" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Ныххӕц, алы ӕвзӕрст %s схафынӕн." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s-ӕй %(sel)s ӕвзӕрст" msgstr[1] "%(cnt)s-ӕй %(sel)s ӕвзӕрст" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -95,7 +97,8 @@ "Ӕнӕвӕрд ивдтытӕ баззадысты ивыны бынӕтты. Кӕд исты ми саразай, уӕд дӕ " "ӕнӕвӕрд ивдтытӕ фесӕфдзысты." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "хорзӕхӕй, ныххӕц Хорзыл цӕмӕй бавӕрд уой. Стӕй дын хъӕудзӕн ацы ми ногӕй " "бакӕнын." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,69 +118,85 @@ "Ды равзӕртай цыдӕр ми, фӕлӕ ивӕн бынӕтты ницы баивтай. Уӕццӕгӕн дӕ Ацӕуыны " "ӕгънӕг хъӕуы, Бавӕрыны нӕ фӕлӕ." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Январь Февраль Мартъи Апрель Июнь Июль Август Сентябрь Октябрь Ноябрь Декабрь" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Х К Д Ӕ Ц М С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Равдисын" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Айсын" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Ныр" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Сахат" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Рӕстӕг равзарын" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Ӕмбисӕхсӕв" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 ӕ.р." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Ӕмбисбон" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Раздӕхын" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Абон" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Къӕлиндар" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Знон" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Сом" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Январь Февраль Мартъи Апрель Июнь Июль Август Сентябрь Октябрь Ноябрь Декабрь" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Х К Д Ӕ Ц М С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Равдисын" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Айсын" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/os/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/os/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/os/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/os/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/os/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/os/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: -# Soslan Khubulov , 2013 -# Soslan Khubulov , 2013 +# Xwybylty Soslan , 2013 +# Xwybylty Soslan , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 17:08+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Ossetic (http://www.transifex.com/projects/p/django/language/" "os/)\n" "MIME-Version: 1.0\n" @@ -18,62 +18,68 @@ "Language: os\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s хафт ӕрцыдысты." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Нӕ уайы схафын %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ӕцӕг дӕ фӕнды?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Схафын ӕвзӕрст %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Иууылдӕр" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "О" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Нӕ" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Ӕнӕбӕрӕг" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Цыфӕнды бон" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Абон" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Фӕстаг 7 бон" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ацы мӕй" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ацы аз" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -82,100 +88,97 @@ "Дӕ хорзӕхӕй, раст кусӕджы аккаунты %(username)s ӕмӕ пароль бафысс. Дӕ сӕры " "дар уый, ӕмӕ дыууӕ дӕр гӕнӕн ис стыр ӕмӕ гыццыл дамгъӕ ӕвзарой." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Дӕ хорзӕхӕй, ногӕй бахиз, уымӕн ӕмӕ дӕ сессийы рӕстӕг фӕцис." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ми:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "мийы рӕстӕг" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "объекты бӕрӕггӕнӕн" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "объекты хуыз" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "мийы флаг" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "фыстӕг фӕивын" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "логы иуӕг" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "логы иуӕгтӕ" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Ӕфтыд ӕрцыд \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Ивд ӕрцыд \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Хафт ӕрцыд \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "ЛогыИуӕг Объект" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Никӕцы" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Ивд %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ӕмӕ" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Бафтыдта %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Changed %(name)s \"%(object)s\"-ы %(list)s." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Схафта %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ивд бынат нӕй." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ӕфтыд ӕрцыд. Дӕ бон у бындӕр та йӕ ивай." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -183,19 +186,19 @@ msgstr "" "%(name)s \"%(obj)s\" ӕфтыд ӕрцыд. Дӕ бон у ӕндӕр %(name)s бындӕр бафтауын." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ӕфтыд ӕрцыд." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "%(name)s \"%(obj)s\" ивд ӕрцыд. Дӕ бон у бындӕ ӕй ногӕй ивай." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -203,163 +206,149 @@ msgstr "" "%(name)s \"%(obj)s\" ивд ӕрцыд. Дӕ бон у ӕндӕр %(name)s бындӕр бафтауын." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ивд ӕрцыд." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Иуӕгтӕ хъуамӕ ӕвзӕрст уой, цӕмӕй цын исты ми бакӕнай. Ницы иуӕг ӕрцыд ивд." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Ницы ми у ӕвзӕрст." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Бафтауын %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" хафт ӕрцыд." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r фыццаг амонӕнимӕ %(name)s-ы объект нӕй." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Бафтауын %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Фӕивын %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Бӕрӕгдоны рӕдыд" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ивд ӕрцыд." msgstr[1] "%(count)s %(name)s ивд ӕрцыдысты." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s у ӕвзӕрст" msgstr[1] "%(total_count)s дӕр иууылдӕр сты ӕвзӕрст" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s-ӕй 0 у ӕвзӕрст" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" хафт ӕрцыд." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ивынты истори: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"%(object_name)s '%(escaped_object)s' хафын домы ацы хъахъхъӕд баст объекттӕ " -"хафын дӕр:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Бахизын" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django сайты админ" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django администраци" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Сайты администраци" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s-ы администраци" - -#: widgets.py:90 -msgid "Date:" -msgstr "Бон:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Рӕстӕг:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Акӕсын" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Бафтауын ӕндӕр" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Нырыккон:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Бахизын" -#: widgets.py:303 -msgid "Change:" -msgstr "Ивд:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Фарс нӕ зыны" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Хатыр, фӕлӕ домд фарс нӕ зыны." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Хӕдзар" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Серверы рӕдыд" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Серверы рӕдыд (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Серверы Рӕдыд (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -367,120 +356,141 @@ "Рӕдыд разынд. Уый тыххӕй сайты администратормӕ электрон фыстӕг ӕрвыст ӕрцыд " "ӕмӕ йӕ тагъд сраст кӕндзысты. Бузныг кӕй лӕууыс." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Бакӕнын ӕвзӕрст ми" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Бацӕуын" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Ам ныххӕц цӕмӕй алы фарсы объекттӕ равзарын" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Равзарын %(total_count)s %(module_name)s иууылдӕр" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Ӕвзӕрст асыгъдӕг кӕнын" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Фыццаг бафысс фӕсномыг ӕмӕ пароль. Стӕй дӕ бон уыдзӕн фылдӕр архайӕджы " +"фадӕттӕ ивын." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Бафысс фӕсномыг ӕмӕ пароль." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Пароль фӕивын" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Дӕ хорзӕхӕй, бындӕр цы рӕдыдтытӕ ис, уыдон сраст кӕн." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Бафысс ног пароль архайӕг %(username)s-ӕн." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Пароль" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Пароль (ногӕй)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Уӕлдӕр цы пароль бафыстай, уый бафысс, цӕмӕй бӕлвырд уа." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Ӕгас цу," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документаци" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Пароль фӕивын" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Рахизын" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django сайты админ" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django администраци" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Бафтауын" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Истори" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Сайты фенын" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Дӕ хорзӕхӕй, бындӕр цы рӕдыдтытӕ ис, уыдон сраст кӕн." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Бафтауын %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Фӕрсудзӕн" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Радӕй айсын" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Рады приоритет: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Рад аивын" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Схафын" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -490,7 +500,7 @@ "%(object_name)s '%(escaped_object)s' хафыны тыххӕй баст объекттӕ дӕр хафт " "ӕрцӕудзысты, фӕлӕ дӕ аккаунтӕн нӕй бар ацы объекты хуызтӕ хафын:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -499,7 +509,7 @@ "%(object_name)s '%(escaped_object)s' хафын домы ацы хъахъхъӕд баст объекттӕ " "хафын дӕр:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -508,16 +518,16 @@ "Ӕцӕг дӕ фӕнды %(object_name)s \"%(escaped_object)s\" схафын? Ацы баст иуӕгтӕ " "иууылдӕр хафт ӕрцӕудзысты:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "О, ӕцӕг мӕ фӕнды" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Цалдӕр объекты схафын" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -527,7 +537,7 @@ "Ӕвзӕрст %(objects_name)s хафыны тыххӕй йемӕ баст объекттӕ дӕр схафт " "уыдзысты, фӕлӕ дӕ аккаунтӕн нӕй бар ацы объекты хуызтӕ хафын:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -535,7 +545,7 @@ msgstr "" "Ӕвзӕрст %(objects_name)s хафын домы ацы хъахъхъӕд баст объекттӕ хафын дӕр:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -544,41 +554,56 @@ "Ӕцӕг дӕ фӕнды ӕвзӕрст %(objects_name)s схафын? ацы объекттӕ иууылдӕр, ӕмӕ " "семӕ баст иуӕгтӕ хафт ӕрцӕудзысты:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Схафын" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Бафтауын ӕндӕр %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Хъӕуы схафын?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s-мӕ гӕсгӕ" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Моделтӕ %(name)s ӕфтуаны" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Фӕивын" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Нӕй дын бар исты ивын." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Фӕстаг митӕ" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Фылдӕр митӕ" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ницы ис" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Ӕнӕбӕрӕг мидис" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -587,138 +612,87 @@ "Дӕ бӕрӕгдоны цыдӕр раст ӕвӕрд нӕу. Сбӕрӕг кӕн, хъӕугӕ бӕрӕгдоны таблицӕтӕ " "конд кӕй сты ӕмӕ амынд архайӕгӕн бӕрӕгдон фӕрсыны бар кӕй ис, уый." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Пароль:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Дӕ пароль кӕнӕ дӕ фӕсномыг ферох кодтай?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Бон/рӕстӕг" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Архайӕг" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ми" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "Ацы объектӕн ивдтыты истори нӕй. Уӕццӕгӕн ацы админӕй ӕфтыд нӕ уыд." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Иууылдӕр равдисын" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Нывӕрын" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Агурын" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s фӕстиуӕг" msgstr[1] "%(counter)s фӕстиуӕджы" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s иумӕ" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Нывӕрын куыд ног" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Нывӕрын ӕмӕ ног бафтауын" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Нывӕрын ӕмӕ дарддӕр ивын" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Фыццаг бафысс фӕсномыг ӕмӕ пароль. Стӕй дӕ бон уыдзӕн фылдӕр архайӕджы " -"фадӕттӕ ивын." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Бафысс фӕсномыг ӕмӕ пароль." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Бафысс ног пароль архайӕг %(username)s-ӕн." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Пароль" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Пароль (ногӕй)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Уӕлдӕр цы пароль бафыстай, уый бафысс, цӕмӕй бӕлвырд уа." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Схафын" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Бафтауын ӕндӕр %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Хъӕуы схафын?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Бузныг дӕ рӕстӕг абон ацы веб сайтимӕ кӕй арвыстай." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Ногӕй бахизын" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Пароль ивын" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Пароль ивд ӕрцыд" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Дӕ пароль ивд ӕрцыд." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -726,46 +700,34 @@ "Дӕ хорзӕхӕй, ӕдасдзинады тыххӕй, бафысс дӕ зӕронд пароль ӕмӕ стӕй та дыууӕ " "хатт дӕ нӕуӕг пароль, цӕмӕй мах сбӕлвырд кӕнӕм раст ӕй кӕй ныффыстай, уый." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Зӕронд пароль" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Ног пароль" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Мӕ пароль фӕивын" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Пароль рацаразын" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Паролы ног арӕзт ӕххӕст у" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Дӕ пароль ӕвӕрд ӕрцыд. Дӕ бон у дарддӕр ацӕуын ӕмӕ бахизын." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Пароль ӕвӕрыны бӕлвырдгӕнӕн" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Бафысс ног пароль" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -773,19 +735,15 @@ "Дӕ хорзӕхӕй, дӕ ног пароль дыууӕ хатт бафысс, цӕмӕй мах сбӕрӕг кӕнӕм раст ӕй " "кӕй ныффыстай, уый." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Ног пароль:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Бӕлвырд пароль:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Пароль ӕвӕрд нӕ ӕрцыд" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -793,12 +751,7 @@ "Парол ӕвӕрыны ӕрвитӕн раст нӕ уыд. Уӕццӕгӕн уый тыххӕй, ӕмӕ нырид пайдагонд " "ӕрцыд. Дӕ хорзӕхӕй, ӕрдом ног пароль ӕвӕрын." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Пароль ӕвӕрд ӕрцыд" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -806,7 +759,7 @@ "Мах ды цы электрон адрис бацамыдтай, уырдӕм арвыстам дӕ пароль сӕвӕрыны " "тыххӕй амынд. Тагъд ӕй хъуамӕ айсай." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -814,7 +767,7 @@ "Кӕд ницы фыстӕг райстай, уӕд, дӕ хорзӕхӕй, сбӕрӕг кӕн цы электрон постимӕ " "срегистраци кодтай, уый бацамыдтай, ӕви нӕ, ӕмӕ абӕрӕг кӕн дӕ спамтӕ." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -823,24 +776,24 @@ "Ды райстай ацы фыстӕг, уымӕн ӕмӕ %(site_name)s-ы дӕ архайӕджы аккаунтӕн " "пароль сӕвӕрын ӕрдомдтай." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Дӕ хорзӕхӕй, ацу ацы фарсмӕ ӕмӕ равзар дӕ ног пароль:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Дӕ фӕсномыг, кӕд дӕ ферох ис:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Бузныг нӕ сайтӕй нын кӕй пайда кӕныс!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s-ы бал" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -848,28 +801,52 @@ "Ферох дӕ ис дӕ пароль? Дӕ пароль бындӕр бафысс, ӕмӕ дӕм мах email-ӕй ног " "пароль сывӕрыны амынд арвитдзыстӕм." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Email адрис:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Мӕ пароль ногӕй сӕвӕрын" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Бонтӕ иууылдӕр" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Никӕцы)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Равзарын %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Равзарын %s ивынӕн" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Бон:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Рӕстӕг:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Акӕсын" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Бафтауын ӕндӕр" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Нырыккон:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ивд:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pa/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/" "language/pa/)\n" "MIME-Version: 1.0\n" @@ -17,153 +17,173 @@ "Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "ਉਪਲੱਬਧ %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "ਫਿਲਟਰ" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "ਸਭ ਚੁਣੋ" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "ਹਟਾਓ" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s ਚੁਣੋ" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "ਜਨਵਰੀ ਫਰਵਰੀ ਮਾਰਚ ਅਪਰੈਲ ਮਈ ਜੂਨ ਜੁਲਾਈ ਅਗਸਤ ਸਤੰਬਰ ਅਕਤੂਬਰ ਨਵੰਬਰ ਦਸੰਬਰ" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T W T F S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "ਵੇਖੋ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "ਓਹਲੇ" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ਹੁਣੇ" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "ਘੜੀ" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "ਸਮਾਂ ਚੁਣੋ" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "ਅੱਧੀ-ਰਾਤ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 ਸਵੇਰ" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "ਦੁਪਹਿਰ" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "ਰੱਦ ਕਰੋ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "ਅੱਜ" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "ਕੈਲੰਡਰ" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "ਕੱਲ੍ਹ" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "ਭਲਕੇ" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "ਜਨਵਰੀ ਫਰਵਰੀ ਮਾਰਚ ਅਪਰੈਲ ਮਈ ਜੂਨ ਜੁਲਾਈ ਅਗਸਤ ਸਤੰਬਰ ਅਕਤੂਬਰ ਨਵੰਬਰ ਦਸੰਬਰ" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T W T F S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "ਵੇਖੋ" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "ਓਹਲੇ" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pa/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pa/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/pa/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/pa/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pa/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/django/" "language/pa/)\n" @@ -17,460 +17,470 @@ "Language: pa\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਈਆਂ ਗਈਆਂ।" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "ਕੀ ਤੁਸੀਂ ਇਹ ਚਾਹੁੰਦੇ ਹੋ?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "ਚੁਣੇ %(verbose_name_plural)s ਹਟਾਓ" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "ਸਭ" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "ਹਾਂ" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "ਨਹੀਂ" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "ਅਣਜਾਣ" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "ਕੋਈ ਵੀ ਮਿਤੀ" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "ਅੱਜ" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "ਪਿਛਲੇ ੭ ਦਿਨ" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "ਇਹ ਮਹੀਨੇ" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "ਇਹ ਸਾਲ" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "ਫੇਰ ਲਾਗਇਨ ਕਰੋ ਜੀ, ਕਿਉਂਕਿ ਤੁਹਾਡੇ ਸ਼ੈਸ਼ਨ ਦੀ ਮਿਆਦ ਪੁੱਗ ਗਈ ਸੀ।" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "ਕਾਰਵਾਈ:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "ਕਾਰਵਾਈ ਸਮਾਂ" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "ਆਬਜੈਕਟ id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "ਆਬਜੈਕਟ repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "ਕਾਰਵਾਈ ਫਲੈਗ" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ਸੁਨੇਹਾ ਬਦਲੋ" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ਲਾਗ ਐਂਟਰੀ" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "ਲਾਗ ਐਂਟਰੀਆਂ" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "ਕੋਈ ਨਹੀਂ" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s ਬਦਲਿਆ।" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ਅਤੇ" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ਸ਼ਾਮਲ ਕੀਤਾ।" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ਲਈ %(list)s ਨੂੰ ਬਦਲਿਆ" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" ਹਟਾਇਆ ਗਿਆ।" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "ਕੋਈ ਖੇਤਰ ਨਹੀਂ ਬਦਲਿਆ।" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਜੋੜਿਆ ਗਿਆ ਸੀ। ਤੁਸੀਂ ਇਸ ਨੂੰ ਹੇਠਾਂ ਸੋਧ ਸਕਦੇ ਹੋ।" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ਨੂੰ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ ਸੀ।" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "ਕੋਈ ਕਾਰਵਾਈ ਨਹੀਂ ਚੁਣੀ ਗਈ।" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s ਸ਼ਾਮਲ" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s ਸ਼ਾਮਲ" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s ਬਦਲੋ" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "ਡਾਟਾਬੇਸ ਗਲਤੀ" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ।" msgstr[1] "%(count)s %(name)s ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲੇ ਗਏ ਹਨ।" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ਚੁਣਿਆ।" msgstr[1] "%(total_count)s ਚੁਣੇ" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" ਠੀਕ ਤਰ੍ਹਾਂ ਹਟਾਇਆ ਗਿਆ ਹੈ।" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "ਅਤੀਤ ਬਦਲੋ: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ਲਾਗ ਇਨ" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ਡੀਜਾਂਗੋ ਸਾਈਟ ਐਡਮਿਨ" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "ਡੀਜਾਂਗੋ ਪਰਸ਼ਾਸ਼ਨ" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "ਸਾਈਟ ਪਰਬੰਧ" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s ਪਰਸ਼ਾਸ਼ਨ" - -#: widgets.py:90 -msgid "Date:" -msgstr "ਮਿਤੀ:" - -#: widgets.py:91 -msgid "Time:" -msgstr "ਸਮਾਂ:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "ਖੋਜ" - -#: widgets.py:260 -msgid "Add Another" -msgstr "ਹੋਰ ਸ਼ਾਮਲ" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ਲਾਗ ਇਨ" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "ਸਫ਼ਾ ਨਹੀਂ ਲੱਭਿਆ" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "ਸਾਨੂੰ ਅਫਸੋਸ ਹੈ, ਪਰ ਅਸੀਂ ਮੰਗਿਆ ਗਿਆ ਸਫ਼ਾ ਨਹੀਂ ਲੱਭ ਸਕੇ।" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "ਘਰ" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "ਸਰਵਰ ਗਲਤੀ" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "ਸਰਵਰ ਗਲਤੀ (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "ਸਰਵਰ ਗਲਤੀ (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "ਚੁਣੀ ਕਾਰਵਾਈ ਕਰੋ" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "ਜਾਓ" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "ਸਭ ਸਫ਼ਿਆਂ ਵਿੱਚੋਂ ਆਬਜੈਕਟ ਚੁਣਨ ਲਈ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "ਸਭ %(total_count)s %(module_name)s ਚੁਣੋ" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "ਚੋਣ ਸਾਫ਼ ਕਰੋ" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "ਪਹਿਲਾਂ ਆਪਣਾ ਯੂਜ਼ਰ ਨਾਂ ਤੇ ਪਾਸਵਰਡ ਦਿਉ। ਫੇਰ ਤੁਸੀਂ ਹੋਰ ਯੂਜ਼ਰ ਚੋਣਾਂ ਨੂੰ ਸੋਧ ਸਕਦੇ ਹੋ।" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "ਪਾਸਵਰਡ ਬਦਲੋ" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਗਲਤੀਆਂ ਠੀਕ ਕਰੋ ਜੀ।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "ਯੂਜ਼ਰ %(username)s ਲਈ ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ।" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "ਪਾਸਵਰਡ" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "ਪਾਸਵਰਡ (ਫੇਰ)" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "ਜੀ ਆਇਆਂ ਨੂੰ, " -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "ਡੌਕੂਮੈਂਟੇਸ਼ਨ" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "ਪਾਸਵਰਡ ਬਦਲੋ" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "ਲਾਗ ਆਉਟ" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ਡੀਜਾਂਗੋ ਸਾਈਟ ਐਡਮਿਨ" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "ਡੀਜਾਂਗੋ ਪਰਸ਼ਾਸ਼ਨ" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "ਸ਼ਾਮਲ" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "ਅਤੀਤ" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "ਸਾਈਟ ਉੱਤੇ ਜਾਓ" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "ਹੇਠ ਦਿੱਤੀਆਂ ਗਲਤੀਆਂ ਠੀਕ ਕਰੋ ਜੀ।" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s ਸ਼ਾਮਲ" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "ਫਿਲਟਰ" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "ਹਟਾਓ" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -478,30 +488,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "ਹਾਂ, ਮੈਂ ਚਾਹੁੰਦਾ ਹਾਂ" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "ਕਈ ਆਬਜੈਕਟ ਹਟਾਓ" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -509,191 +519,157 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "ਹਟਾਓ" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "%(verbose_name)s ਹੋਰ ਸ਼ਾਮਲ" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "ਹਟਾਉਣਾ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s ਵਲੋਂ " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "ਬਦਲੋ" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "ਤੁਹਾਨੂੰ ਕੁਝ ਵੀ ਸੋਧਣ ਦਾ ਅਧਿਕਾਰ ਨਹੀਂ ਹੈ।" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "ਤਾਜ਼ਾ ਕਾਰਵਾਈਆਂ" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "ਮੇਰੀਆਂ ਕਾਰਵਾਈਆਂ" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "ਕੋਈ ਉਪਲੱਬਧ ਨਹੀਂ" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "ਅਣਜਾਣ ਸਮੱਗਰੀ" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "ਪਾਸਵਰਡ:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "ਮਿਤੀ/ਸਮਾਂ" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "ਯੂਜ਼ਰ" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "ਕਾਰਵਾਈ" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "ਸਭ ਵੇਖੋ" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "ਸੰਭਾਲੋ" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "ਖੋਜ" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s ਕੁੱਲ" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "ਨਵੇਂ ਵਜੋਂ ਵੇਖੋ" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "ਸੰਭਾਲੋ ਤੇ ਹੋਰ ਸ਼ਾਮਲ" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "ਸੰਭਾਲੋ ਤੇ ਸੋਧਣਾ ਜਾਰੀ ਰੱਖੋ" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "ਪਹਿਲਾਂ ਆਪਣਾ ਯੂਜ਼ਰ ਨਾਂ ਤੇ ਪਾਸਵਰਡ ਦਿਉ। ਫੇਰ ਤੁਸੀਂ ਹੋਰ ਯੂਜ਼ਰ ਚੋਣਾਂ ਨੂੰ ਸੋਧ ਸਕਦੇ ਹੋ।" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "ਯੂਜ਼ਰ %(username)s ਲਈ ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ।" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "ਪਾਸਵਰਡ" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "ਪਾਸਵਰਡ (ਫੇਰ)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "ਜਾਂਚ ਲਈ, ਉੱਤੇ ਦਿੱਤਾ ਪਾਸਵਰਡ ਹੀ ਦਿਓ।" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "ਹਟਾਓ" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "%(verbose_name)s ਹੋਰ ਸ਼ਾਮਲ" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "ਹਟਾਉਣਾ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ਅੱਜ ਵੈੱਬਸਾਈਟ ਨੂੰ ਕੁਝ ਚੰਗਾ ਸਮਾਂ ਦੇਣ ਲਈ ਧੰਨਵਾਦ ਹੈ।" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ਫੇਰ ਲਾਗਇਨ ਕਰੋ" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "ਪਾਸਵਰਡ ਬਦਲੋ" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਬਦਲਿਆ ਗਿਆ ਹੈ।" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -701,65 +677,49 @@ "ਸੁਰੱਖਿਆ ਲਈ ਪਹਿਲਾਂ ਆਪਣਾ ਪੁਰਾਣਾ ਪਾਸਵਰਡ ਦਿਉ, ਅਤੇ ਫੇਰ ਆਪਣਾ ਨਵਾਂ ਪਾਸਵਰਡ ਦੋ ਵਰਾ ਦਿਉ ਤਾਂ ਕਿ " "ਅਸੀਂ ਜਾਂਚ ਸਕੀਏ ਕਿ ਤੁਸੀਂ ਇਹ ਠੀਕ ਤਰ੍ਹਾਂ ਲਿਖਿਆ ਹੈ।" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "ਪੁਰਾਣਾ ਪਾਸਵਰਡ" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "ਨਵਾਂ ਪਾਸਵਰਡ" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "ਮੇਰਾ ਪਾਸਵਰਡ ਬਦਲੋ" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰਨਾ ਪੂਰਾ ਹੋਇਆ" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "ਤੁਹਾਡਾ ਪਾਸਵਰਡ ਸੈੱਟ ਕੀਤਾ ਗਿਆ ਹੈ। ਤੁਸੀਂ ਜਾਰੀ ਰੱਖ ਕੇ ਹੁਣੇ ਲਾਗਇਨ ਕਰ ਸਕਦੇ ਹੋ।" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਪੁਸ਼ਟੀ" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "ਨਵਾਂ ਪਾਸਵਰਡ ਦਿਓ" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" "ਆਪਣਾ ਨਵਾਂ ਪਾਸਵਰਡ ਦੋ ਵਾਰ ਦਿਉ ਤਾਂ ਕਿ ਅਸੀਂ ਜਾਂਚ ਕਰ ਸਕੀਏ ਕਿ ਤੁਸੀਂ ਠੀਕ ਤਰ੍ਹਾਂ ਲਿਖਿਆ ਹੈ।" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "ਨਵਾਂ ਪਾਸਵਰਡ:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "ਪਾਸਵਰਡ ਪੁਸ਼ਟੀ:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰਨ ਅਸਫ਼ਲ" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -767,75 +727,94 @@ "ਪਾਸਵਰਡ ਰੀ-ਸੈੱਟ ਲਿੰਕ ਗਲਤ ਹੈ, ਸੰਭਵ ਤੌਰ ਉੱਤੇ ਇਹ ਪਹਿਲਾਂ ਹੀ ਵਰਤਿਆ ਜਾ ਚੁੱਕਾ ਹੈ। ਨਵਾਂ ਪਾਸਵਰਡ ਰੀ-" "ਸੈੱਟ ਲਈ ਬੇਨਤੀ ਭੇਜੋ ਜੀ।" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "ਪਾਸਵਰਡ ਠੀਕ ਤਰ੍ਹਾਂ ਬਦਲਿਆ ਗਿਆ" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "ਅੱਗੇ ਦਿੱਤੇ ਸਫ਼ੇ ਉੱਤੇ ਜਾਉ ਤੇ ਨਵਾਂ ਪਾਸਵਰਡ ਚੁਣੋ:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "ਤੁਹਾਡਾ ਯੂਜ਼ਰ ਨਾਂ, ਜੇ ਕਿਤੇ ਗਲਤੀ ਨਾਲ ਭੁੱਲ ਗਏ ਹੋਵੋ:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "ਸਾਡੀ ਸਾਈਟ ਵਰਤਣ ਲਈ ਧੰਨਵਾਦ ਜੀ!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s ਟੀਮ" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "ਮੇਰਾ ਪਾਸਵਰਡ ਮੁੜ-ਸੈੱਟ ਕਰੋ" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "ਸਭ ਮਿਤੀਆਂ" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s ਚੁਣੋ" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "ਬਦਲਣ ਲਈ %s ਚੁਣੋ" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "ਮਿਤੀ:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "ਸਮਾਂ:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "ਖੋਜ" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "ਹੋਰ ਸ਼ਾਮਲ" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pl/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,15 +3,16 @@ # Translators: # angularcircle, 2011 # Jannis Leidel , 2011 -# konryd , 2011 +# Janusz Harkot , 2014 +# konryd , 2011 # Roman Barczyński , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-31 21:01+0000\n" +"Last-Translator: Janusz Harkot \n" "Language-Team: Polish (http://www.transifex.com/projects/p/django/language/" "pl/)\n" "MIME-Version: 1.0\n" @@ -21,12 +22,12 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Dostępne %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +36,38 @@ "To jest lista dostępnych %s. Aby wybrać pozycje zaznacz je i kliknij " "strzałkę \"Wybierz\" pomiędzy listami." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Pisz tutaj aby wyfiltrować listę dostępnych %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtr" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Wybierz wszystko" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Kliknij aby wybrać wszystkie %s na raz." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Wybierz" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Usuń" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Wybrano %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,23 +76,25 @@ "To jest lista wybranych %s. Aby usunąć zaznacz pozycje wybrane do usunięcia " "i kliknij strzałkę \"Usuń\" pomiędzy listami." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Usuń wszystkie" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Kliknij aby usunąć wszystkie wybrane %s na raz." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Zaznaczono %(sel)s z %(cnt)s" msgstr[1] "Zaznaczono %(sel)s z %(cnt)s" msgstr[2] "Zaznaczono %(sel)s z %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +102,8 @@ "Zmiany w niektórych polach nie zostały zachowane. Po wykonaniu akcji zmiany " "te zostaną utracone." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +112,8 @@ "Wybrano akcję, lecz część zmian w polach nie została zachowana. Kliknij OK " "aby zapisać. Aby wykonać akcję, należy ją ponownie uruchomić." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +122,96 @@ "Wybrano akcję, lecz nie dokonano żadnych zmian. Prawdopodobnie szukasz " "przycisku \"Wykonaj\" (a nie \"Zapisz\")" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Styczeń Luty Marzec Kwiecień Maj Czerwiec Lipiec Sierpień Wrzesień " -"Październik Listopad Grudzień" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "N Pn Wt Śr Cz Pt So" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Pokaż" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ukryj" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +"Uwaga: Czas lokalny jest przesunięty %s godzinę w stosunku do czasu serwera." +msgstr[1] "" +"Uwaga: Czas lokalny jest przesunięty %s godziny w stosunku do czasu serwera." +msgstr[2] "" +"Uwaga: Czas lokalny jest przesunięty %s godzin w stosunku do czasu serwera." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +"Uwaga: Czas lokalny jest przesunięty o %s godzinę w stosunku do czasu " +"serwera." +msgstr[1] "" +"Uwaga: Czas lokalny jest przesunięty o %s godziny w stosunku do czasu " +"serwera." +msgstr[2] "" +"Uwaga: Czas lokalny jest przesunięty o %s godzin w stosunku do czasu serwera." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Teraz" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Zegar" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Wybierz czas" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Północ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 rano" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Południe" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Anuluj" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Dzisiaj" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendarz" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Wczoraj" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Jutro" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Styczeń Luty Marzec Kwiecień Maj Czerwiec Lipiec Sierpień Wrzesień " +"Październik Listopad Grudzień" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "N Pn Wt Śr Cz Pt So" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Pokaż" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ukryj" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pl/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/pl/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/pl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,18 +2,22 @@ # # Translators: # angularcircle, 2011-2013 -# angularcircle, 2013 +# angularcircle, 2013-2014 # Jannis Leidel , 2011 +# Janusz Harkot , 2014 # Karol , 2012 -# konryd , 2011 -# ola , 2013 +# konryd , 2011 +# konryd , 2011 +# Ola Sitarska , 2013 +# Ola Sitarska , 2013 +# Roman Barczyński , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-19 11:16+0000\n" +"Last-Translator: sidewinder \n" "Language-Team: Polish (http://www.transifex.com/projects/p/django/language/" "pl/)\n" "MIME-Version: 1.0\n" @@ -23,165 +27,168 @@ "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Usunięto %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Nie można usunąć %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Jesteś pewien?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Usuń wybrane %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administracja" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Wszystko" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Tak" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nie" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nieznany" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Dowolna data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Dzisiaj" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Ostatnie 7 dni" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ten miesiąc" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ten rok" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Wprowadź poprawną %(username)s i hasło dla konta należącego do zespołu. " -"Uwaga: wielkość liter może mieć znaczenie." +"Wprowadź poprawne dane w polach \"%(username)s\" i \"hasło\" dla konta " +"należącego do zespołu. Uwaga: wielkość liter może mieć znaczenie." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Twoja sesja wygasła, zaloguj się ponownie." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Akcja:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "czas akcji" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id obiektu" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "reprezentacja obiektu" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "flaga akcji" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "zmień wiadomość" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "log" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "logi" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Dodano \" %(object)s \"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Zmieniono \" %(object)s \" - %(changes)s " -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Usunięto \" %(object)s \"." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Obiekt typu LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "brak" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Zmieniono %s" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "i" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodano %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Zmieniono %(list)s w %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Usunięto %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Żadne pole nie zmienione." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" dodane pomyślnie. Możesz edytować ponownie wpis poniżej." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -190,12 +197,12 @@ "Pomyślnie dodano %(name)s \"%(obj)s\". Poniżej możesz dodać dodać kolejny " "%(name)s." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" dodany pomyślnie." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -204,7 +211,7 @@ "Zmiany w %(name)s \"%(obj)s\" zostały zapisane. Poniżej możesz edytować go " "ponownie." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -213,42 +220,47 @@ "Zmiany w %(name)s \"%(obj)s\" zostały zapisane. Poniżej możesz dodać dodać " "kolejny %(name)s." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" zostało pomyślnie zmienione." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Wykonanie akcji wymaga wybrania obiektów. Żaden obiekt nie został zmieniony." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nie wybrano akcji." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Dodaj %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Obiekt %(name)s o kluczu głównym %(key)r nie istnieje." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Dodaj %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Zmień %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Błąd bazy danych" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -256,7 +268,7 @@ msgstr[1] "%(count)s %(name)s zostały pomyślnie zmienione." msgstr[2] "%(count)s %(name)s zostało pomyślnie zmienionych." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -264,114 +276,97 @@ msgstr[1] "%(total_count)s wybrane" msgstr[2] "%(total_count)s wybranych" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 z %(cnt)s wybranych" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" usunięty pomyślnie." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Historia zmian: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Usunięcie %(object_name)s '%(escaped_object)s' wymaga skasowania " -"następujących chronionych obiektów, które są z nim powiązane:" +"Usunięcie %(class_name)s %(instance)s spowoduje usunięcia następujących " +"chronionych obiektów pokrewnych: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Zaloguj się" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Administracja stroną Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administracja Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administracja stroną" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s - administracja" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Czas:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Szukaj" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Dodaj kolejny" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Aktualny:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Zaloguj się" -#: widgets.py:303 -msgid "Change:" -msgstr "Zmień:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s - administracja" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Strona nie znaleziona" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Niestety, żądana strona nie została znaleziona." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Początek" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Błąd serwera" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Błąd serwera (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Błąd Serwera (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -380,120 +375,141 @@ "poprzez email i niebawem zaistniały problem powinien zostać rozwiązany. " "Dziękujemy za wyrozumiałość." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Wykonaj wybraną akcję" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Wykonaj" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kliknij by wybrać obiekty na wszystkich stronach" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Wybierz wszystkie %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Wyczyść wybór" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Najpierw podaj nazwę użytkownika i hasło. Następnie będziesz mógł edytować " +"więcej opcji użytkownika." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Podaj nazwę użytkownika i hasło." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Zmiana hasła" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Proszę, popraw poniższe błędy." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Proszę, popraw poniższe błędy." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Podaj nowe hasło dla użytkownika %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Hasło" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Hasło (powtórz)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Podaj powyższe hasło w celu weryfikacji." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Witaj," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentacja" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Zmiana hasła" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Wyloguj się" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administracja stroną Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administracja Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Dodaj" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Pokaż na stronie" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Proszę, popraw poniższe błędy." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Dodaj %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtr" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Usuń z sortowania" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Priorytet sortowania: %(priority_number)s " -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Zmień sortowanie" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Usuń" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -504,7 +520,7 @@ "obiektów, które są z nim powiązane. Niestety nie posiadasz uprawnień do " "usunięcia następujących typów obiektów:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -513,7 +529,7 @@ "Usunięcie %(object_name)s '%(escaped_object)s' wymaga skasowania " "następujących chronionych obiektów, które są z nim powiązane:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -522,16 +538,16 @@ "Czy chcesz skasować %(object_name)s \"%(escaped_object)s\"? Następujące " "zależne obiekty zostaną skasowane:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Tak, na pewno" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Usuwanie wielu obiektów" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -542,7 +558,7 @@ "powiązane. Niestety nie posiadasz uprawnień do usunięcia następujących typów " "obiektów:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -551,7 +567,7 @@ "Usunięcie %(objects_name)s wymaga skasowania następujących chronionych " "obiektów, które są z nim powiązane:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -560,41 +576,56 @@ "Czy chcesz skasować zaznaczone %(objects_name)s? Następujące obiekty oraz " "obiekty od nich zależne zostaną skasowane:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Usuń" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Dodaj kolejne %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Usunąć?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Używając %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modele w aplikacji %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Zmień" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nie masz uprawnień by edytować cokolwiek." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Ostatnie akcje" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Moje akcje" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Brak" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Zawartość nieznana" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -604,27 +635,27 @@ "tabele zostały utworzone i odpowiedni użytkownik jest uprawniony do ich " "odczytu." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Hasło:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Nie pamiętasz swojego hasła, bądź nazwy konta użytkownika?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/czas" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Użytkownik" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Akcja" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -632,19 +663,20 @@ "Ten obiekt nie ma historii zmian. Najprawdopodobniej wpis ten nie został " "dodany poprzez panel administracyjny." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Pokaż wszystko" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Zapisz" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Szukaj" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -652,138 +684,74 @@ msgstr[1] "%(counter)s wyniki" msgstr[2] "%(counter)s wyników" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s trafień" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Zapisz jako nowe" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Zapisz i dodaj nowe" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Zapisz i kontynuuj edycję" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Najpierw podaj nazwę użytkownika i hasło. Następnie będziesz mógł edytować " -"więcej opcji użytkownika." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Podaj nazwę użytkownika i hasło." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Podaj nowe hasło dla użytkownika %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Hasło" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Hasło (powtórz)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Podaj powyższe hasło w celu weryfikacji." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Usuń" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Dodaj kolejne %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Usunąć?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Dziękujemy za odwiedzenie serwisu." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Zaloguj się ponownie" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Zmiana hasła" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Hasło zmienione" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Twoje hasło zostało zmienione." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "Podaj swoje stare hasło i dwa razy nowe." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Stare hasło" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nowe hasło" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Zmień hasło" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Zresetuj hasło" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Hasło zostało zresetowane" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Twoje hasło zostało ustawione. Możesz się teraz zalogować." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potwierdzenie zresetowania hasła" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Podaj nowe hasło" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -791,19 +759,15 @@ "Podaj dwukrotnie nowe hasło, by można było zweryfikować, czy zostało wpisane " "poprawnie." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nowe hasło:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potwierdź hasło:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Zresetowanie hasła nie powiodło się" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -811,12 +775,7 @@ "Link pozwalający na reset hasła jest niepoprawny - być może dlatego, że " "został już raz użyty. Możesz ponownie zażądać zresetowania hasła." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Zresetowanie hasła zakończyło się powodzeniem" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -824,7 +783,7 @@ "Instrukcja pozwalająca ustawić nowe hasło dla podanego adresu email została " "wysłana. Niebawem powinna się pojawić na Twoim koncie pocztowym." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -833,7 +792,7 @@ "wprowadzony jest zgodny z tym podanym podczas rejestracji i sprawdź " "zawartość folderu SPAM na swoim koncie." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -842,26 +801,26 @@ "Otrzymujesz tę wiadomość, gdyż skorzystano z opcji resetu hasła dla Twojego " "konta na stronie %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" "Aby wprowadzić nowe hasło, proszę przejść na stronę, której adres widnieje " "poniżej:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Twoja nazwa użytkownika:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Dziękujemy za skorzystanie naszej strony." -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Zespół %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -869,28 +828,52 @@ "Nie pamiętasz swojego hasła? Wprowadź w poniższym polu swój adres email, a " "wyślemy Ci instrukcję opisującą sposób ustawienia nowego hasła." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Adres email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Zresetuj moje hasło" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Wszystkie daty" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Brak)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Zaznacz %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Zaznacz %s aby zmienić" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Czas:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Szukaj" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Dodaj kolejny" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Aktualny:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Zmień:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pt/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,12 +4,13 @@ # Jannis Leidel , 2011 # Nuno Mariz , 2011-2012 # Paulo Köch , 2011 +# Raúl Pedro Fernandes Santos, 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-10-31 16:33+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-04 08:58+0000\n" "Last-Translator: Nuno Mariz \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/django/" "language/pt/)\n" @@ -19,12 +20,12 @@ "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Disponível %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +34,38 @@ "Esta é a lista de %s disponíveis. Poderá escolher alguns, selecionando-os na " "caixa abaixo e clicando na seta \"Escolher\" entre as duas caixas." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Digite nesta caixa para filtrar a lista de %s disponíveis." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtrar" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Escolher todos" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Clique para escolher todos os %s de uma vez." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Escolher" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Remover" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Escolhido %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +74,24 @@ "Esta é a lista de %s escolhidos. Poderá remover alguns, selecionando-os na " "caixa abaixo e clicando na seta \"Remover\" entre as duas caixas." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Remover todos" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Clique para remover todos os %s escolhidos de uma vez." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s selecionado" msgstr[1] "%(sel)s de %(cnt)s selecionados" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +99,8 @@ "Tem mudanças por guardar nos campos individuais. Se usar uma ação, as suas " "mudanças por guardar serão perdidas." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +109,8 @@ "Selecionou uma ação mas ainda não guardou as mudanças dos campos " "individuais. Carregue em OK para gravar. Precisará de correr de novo a ação." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +119,90 @@ "Selecionou uma ação mas ainda não guardou as mudanças dos campos " "individuais. Provavelmente quererá o botão Ir ao invés do botão Guardar." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Outubro " -"Novembro Dezembro" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D S T Q Q S S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ocultar" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +"Nota: O seu fuso horário está %s hora adiantado em relação ao servidor." +msgstr[1] "" +"Nota: O seu fuso horário está %s horas adiantado em relação ao servidor." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +"Nota: O use fuso horário está %s hora atrasado em relação ao servidor." +msgstr[1] "" +"Nota: O use fuso horário está %s horas atrasado em relação ao servidor." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Agora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Relógio" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Escolha a hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Meia-noite" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Meio-dia" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancelar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hoje" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendário" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ontem" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Amanhã" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Outubro " +"Novembro Dezembro" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D S T Q Q S S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ocultar" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pt/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pt/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/pt/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/pt/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pt/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,13 +4,14 @@ # Jannis Leidel , 2011 # Nuno Mariz , 2013 # Paulo Köch , 2011 +# Raúl Pedro Fernandes Santos, 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-31 16:32+0000\n" -"Last-Translator: Nuno Mariz \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 17:10+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Portuguese (http://www.transifex.com/projects/p/django/" "language/pt/)\n" "MIME-Version: 1.0\n" @@ -19,62 +20,68 @@ "Language: pt\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Foram removidos com sucesso %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Não é possível remover %(name)s " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Tem a certeza?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Remover %(verbose_name_plural)s selecionados" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administração" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Todos" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sim" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Não" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Desconhecido" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Qualquer data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hoje" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últimos 7 dias" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Este mês" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Este ano" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -83,94 +90,91 @@ "Por favor introduza o %(username)s e password corretos para a conta de " "equipa. Tenha em atenção às maiúsculas e minúsculas." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Por favor autentique-se novamente, porque a sua sessão expirou." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ação:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora da ação" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id do objeto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr do objeto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "flag de ação" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "modificar mensagem" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada de log" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entradas de log" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Adicionado \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Foram modificados \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Foram removidos \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objeto LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nenhum" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Foi modificado %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "e" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Foram adicionados %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Foram modificados %(list)s para %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Foram removidos %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nenhum campo foi modificado." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -178,7 +182,7 @@ "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso. Pode voltar a " "editar novamente abaixo." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +191,12 @@ "O %(name)s \"%(obj)s\" foi adicionado corretamente. Pode adicionar um novo " "%(name)s abaixo." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi adicionado(a) com sucesso." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +205,7 @@ "O %(name)s \"%(obj)s\" foi modificado corretamente. Pode editá-lo novamente " "abaixo." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +214,12 @@ "O %(name)s \"%(obj)s\" foi modificado corretamente. Pode adicionar um novo " "%(name)s abaixo." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "O(A) %(name)s \"%(obj)s\" foi modificado(a) com sucesso." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,151 +227,137 @@ "Os itens devem ser selecionados de forma a efectuar ações sobre eles. Nenhum " "item foi modificado." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nenhuma ação selecionada." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Adicionar %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "O(A) %(name)s \"%(obj)s\" foi removido(a) com sucesso." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "O object %(name)s com a chave primária %(key)r não existe." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Adicionar %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Erro de base de dados" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s foi modificado com sucesso." msgstr[1] "%(count)s %(name)s foram modificados com sucesso." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s selecionado" msgstr[1] "Todos %(total_count)s selecionados" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s selecionados" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "O(A) %(name)s \"%(obj)s\" foi removido(a) com sucesso." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Histórico de modificações: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Remover o %(object_name)s ' %(escaped_object)s ' exigiria a remoção dos " -"seguintes objetos protegidos relacionados:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Entrar" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Site de administração do Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administração do Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administração do site" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administração de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Procurar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Adicionar Outro" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Atualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Entrar" -#: widgets.py:303 -msgid "Change:" -msgstr "Modificar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Administração de %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Página não encontrada" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Pedimos desculpa, mas a página solicitada não foi encontrada." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Início" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Erro do servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Erro do servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Erro do servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -375,120 +365,143 @@ "Ocorreu um erro. Foi enviada uma notificação para os administradores do " "site, devendo o mesmo ser corrigido em breve. Obrigado pela atenção." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Executar a acção selecionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Ir" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Clique aqui para selecionar os objetos em todas as páginas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Selecionar todos %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Remover seleção" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primeiro introduza o nome do utilizador e palavra-passe. Depois poderá " +"editar mais opções do utilizador." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Introduza o utilizador e palavra-passe." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Modificar palavra-passe" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Por favor corrija os erros abaixo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Por favor corrija os erros abaixo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Introduza uma nova palavra-passe para o utilizador %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Palavra-passe" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Palavra-passe (novamente)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Introduza a palavra-passe como acima, para verificação." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bem-vindo," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentação" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Modificar palavra-passe" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Sair" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Site de administração do Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administração do Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Adicionar" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "História" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ver no site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Por favor corrija os erros abaixo." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Por favor corrija os erros abaixo." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Adicionar %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtro" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Remover da ordenação" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioridade de ordenação: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Altenar ordenação" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Remover" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -499,7 +512,7 @@ "objetos relacionados, mas a sua conta não tem permissão de remoção dos " "seguintes tipos de objetos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -508,7 +521,7 @@ "Remover o %(object_name)s ' %(escaped_object)s ' exigiria a remoção dos " "seguintes objetos protegidos relacionados:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -517,16 +530,16 @@ "Tem a certeza que deseja remover %(object_name)s \"%(escaped_object)s\"? " "Todos os items relacionados seguintes irão ser removidos:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sim, tenho a certeza" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Remover múltiplos objetos." -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -537,7 +550,7 @@ "objetos relacionados, mas a sua conta não tem permissão para remover os " "seguintes tipos de objetos:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -546,7 +559,7 @@ "Remover o %(objects_name)s selecionado exigiria remover os seguintes objetos " "protegidos relacionados:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -555,41 +568,56 @@ "Tem certeza de que deseja remover %(objects_name)s selecionado? Todos os " "objetos seguintes e seus itens relacionados serão removidos:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Remover" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Adicionar outro %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Remover?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Por %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelos na aplicação %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Não tem permissão para modificar nada." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Ações Recentes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "As minhas Ações" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nenhum disponível" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Conteúdo desconhecido" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -599,27 +627,27 @@ "as tabelas da base de dados foram criadas apropriadamente e verifique se a " "base de dados pode ser lida pelo utilizador definido." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Palavra-passe:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Esqueceu-se da sua palavra-passe ou utilizador?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Utilizador" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ação" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -627,114 +655,61 @@ "Este objeto não tem histórico de modificações. Provavelmente não foi " "modificado via site de administração." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostrar todos" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Gravar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Pesquisar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultado" msgstr[1] "%(counter)s resultados" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s no total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Gravar como novo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Gravar e adicionar outro" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Gravar e continuar a editar" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primeiro introduza o nome do utilizador e palavra-passe. Depois poderá " -"editar mais opções do utilizador." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Introduza o utilizador e palavra-passe." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Introduza uma nova palavra-passe para o utilizador %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Palavra-passe" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Palavra-passe (novamente)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Introduza a palavra-passe como acima, para verificação." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Remover" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Adicionar outro %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Remover?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Obrigado pela sua visita." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Entrar novamente" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Modificação da palavra-passe" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Palavra-passe modificada com sucesso" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "A sua palavra-passe foi modificada." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -743,46 +718,34 @@ "depois introduza a nova duas vezes para que possamos verificar se introduziu " "corretamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Palavra-passe antiga" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nova palavra-passe" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Modificar a minha palavra-passe" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Palavra-passe de reinicialização" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Reinicialização da palavra-passe concluída" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "A sua palavra-passe foi atribuída. Pode entrar agora." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmação da reinicialização da palavra-passe" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Introduza a nova palavra-passe" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -790,19 +753,15 @@ "Por favor, introduza a sua nova palavra-passe duas vezes para verificarmos " "se está correcta." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nova palavra-passe:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirmação da palavra-passe:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Palavra-passe reinicializada sem sucesso" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -811,12 +770,7 @@ "porque já foi usado. Por favor requisite uma nova reinicialização da palavra-" "passe." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Palavra-passe reinicializada com sucesso" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -824,7 +778,7 @@ "Foram enviadas para o e-mail indicado as instruções de configuração da " "palavra-passe. Deverá recebê-las brevemente." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -833,7 +787,7 @@ "com o qual se registou e verifique a sua pasta de correio electrónico não " "solicitado." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -842,24 +796,24 @@ "Está a receber este email porque pediu para redefinir a palavra-chave para o " "seu utilizador no site %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Por favor siga a seguinte página e escolha a sua nova palavra-passe:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "O seu nome de utilizador, no caso de se ter esquecido:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Obrigado pela sua visita ao nosso site!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "A equipa do %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -867,28 +821,52 @@ "Esqueceu-se da sua palavra-chave? Introduza o seu endereço de email e enviar-" "lhe-emos instruções para definir uma nova." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Endereço de email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Reinicializar a minha palavra-passe" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Todas as datas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nada)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Selecionar %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Selecione %s para modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Procurar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Adicionar Outro" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Atualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Modificar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pt_BR/LC_MESSAGES/djangojs.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: +# Allisson Azevedo , 2014 # Eduardo Carvalho , 2011 # Guilherme Gondim , 2012 # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-27 12:49+0000\n" +"Last-Translator: Allisson Azevedo \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "django/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -19,12 +20,12 @@ "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s disponíveis" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +34,38 @@ "Esta é a lista de %s disponíveis. Você pode escolhê-los(as) selecionando-os" "(as) abaixo e clicando na seta \"Escolher\" entre as duas caixas." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Digite nessa caixa para filtrar a lista de %s disponíveis." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Escolher todos" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Clique para escolher todos os %s de uma só vez" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Escolher" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Remover" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s escolhido(s)" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +74,24 @@ "Esta é a lista de %s disponíveis. Você pode removê-los(as) selecionando-os" "(as) abaixo e clicando na seta \"Remover\" entre as duas caixas." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Remover todos" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Clique para remover de uma só vez todos os %s escolhidos." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s de %(cnt)s selecionado" msgstr[1] "%(sel)s de %(cnt)s selecionados" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +99,8 @@ "Você tem alterações não salvas em campos editáveis individuais. Se você " "executar uma ação suas alterações não salvas serão perdidas." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +109,8 @@ "Você selecionou uma ação, mas você não salvou as alterações de cada campo " "ainda. Clique em OK para salvar. Você vai precisar executar novamente a ação." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +119,86 @@ "Você selecionou uma ação, e você não fez alterações em campos individuais. " "Você provavelmente está procurando o botão Ir ao invés do botão \"Salvar\"." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Outubro " -"Novembro Dezembro" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D S T Q Q S S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Mostrar" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Esconder" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Nota: Você está %s hora à frente do horário do servidor." +msgstr[1] "Nota: Você está %s horas à frente do horário do servidor." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Nota: Você está %s hora atrás do tempo do servidor." +msgstr[1] "Nota: Você está %s horas atrás do tempo do servidor." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Agora" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Relógio" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Escolha uma hora" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Meia-noite" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 da manhã" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Meio-dia" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Cancelar" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hoje" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendário" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ontem" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Amanhã" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Janeiro Fevereiro Março Abril Maio Junho Julho Agosto Setembro Outubro " +"Novembro Dezembro" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D S T Q Q S S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Mostrar" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Esconder" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/pt_BR/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,18 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Allisson Azevedo , 2014 +# bruno.devpod , 2014 # dudanogueira , 2012 # Elyézer Rezende , 2013 -# Gladson Simplício Brito , 2013 +# Gladson , 2013 # Guilherme Gondim , 2012-2013 # 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-09-23 20:34+0000\n" -"Last-Translator: Guilherme Gondim \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 17:55+0000\n" +"Last-Translator: bruno.devpod \n" "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/" "django/language/pt_BR/)\n" "MIME-Version: 1.0\n" @@ -21,62 +23,68 @@ "Language: pt_BR\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Removido %(count)d %(items)s com sucesso." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Não é possível excluir %(name)s " -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Tem certeza?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Remover %(verbose_name_plural)s selecionados" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administração" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Todos" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Sim" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Não" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Desconhecido" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Qualquer data" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hoje" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Últimos 7 dias" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Este mês" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Este ano" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,94 +93,91 @@ "Por favor, insira um %(username)s e senha corretos para uma conta de equipe. " "Note que ambos campos são sensíveis a maiúsculas e minúsculas." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Por favor acesse novamente, pois sua sessão expirou." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Ação:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "hora da ação" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id do objeto" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr do objeto" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "flag de ação" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "modificar mensagem" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "entrada de log" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "entradas de log" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Adicionado \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Modificado \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Removido \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objeto LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nenhum" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Modificado %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "e" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Adicionado %(name)s \"%(object)s\"" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Modificado %(list)s para %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Deletado %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nenhum campo modificado." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -180,7 +185,7 @@ "%(name)s \"%(obj)s\": adicionado com sucesso. Você pode editar novamente " "abaixo." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +194,12 @@ "%(name)s \"%(obj)s\" adicionado com sucesso. Você pode adicionar um outro " "%(name)s abaixo." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\": adicionado com sucesso." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -203,7 +208,7 @@ "%(name)s \"%(obj)s\" modificado com sucesso. Você pode editá-lo novamente " "abaixo." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -212,12 +217,12 @@ "%(name)s \"%(obj)s\" alterado com sucesso. Você pode adicionar um outro " "%(name)s abaixo." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\": modificado com sucesso." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -225,151 +230,139 @@ "Os itens devem ser selecionados a fim de executar ações sobre eles. Nenhum " "item foi modificado." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nenhuma ação selecionada." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Adicionar %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\": excluído com sucesso." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objeto %(name)s com chave primária %(key)r não existe." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Adicionar %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Modificar %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Erro no banco de dados" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s modificado com sucesso." msgstr[1] "%(count)s %(name)s modificados com sucesso." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s selecionado" msgstr[1] "Todos %(total_count)s selecionados" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 de %(cnt)s selecionados" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\": excluído com sucesso." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Histórico de modificações: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Excluir o %(object_name)s '%(escaped_object)s' exigiria excluir os seguintes " -"objetos protegidos relacionados:" +"Excluir o %(class_name)s %(instance)s exigiria excluir os seguintes objetos " +"protegidos relacionados: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Acessar" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Site de administração do Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administração do Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administração do Site" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administração de %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Data:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Hora:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Olhar" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Adicionar Outro(a)" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Atualmente:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Acessar" -#: widgets.py:303 -msgid "Change:" -msgstr "Alterar:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s administração" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Página não encontrada" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Desculpe, mas a página requisitada não pode ser encontrada." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Início" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Erro no servidor" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Erro no servidor (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Erro no Servidor (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -377,120 +370,141 @@ "Houve um erro, que já foi reportado aos administradores do site por email e " "deverá ser consertado em breve. Obrigado pela sua paciência." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Executar ação selecionada" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Fazer" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Clique aqui para selecionar os objetos de todas as páginas" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Selecionar todos %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Limpar seleção" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Primeiro, informe um nome de usuário e senha. Depois você será capaz de " +"editar mais opções do usuário." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Digite um nome de usuário e senha." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Alterar senha" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Por favor, corrija os erros abaixo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Por favor, corrija os erros abaixo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Informe uma nova senha para o usuário %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Senha" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Senha (novamente)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Informe a mesma senha digitada acima, para verificação." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bem-vindo(a)," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentação" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Alterar senha" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Encerrar sessão" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Site de administração do Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administração do Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Adicionar" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Histórico" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ver no site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Por favor, corrija os erros abaixo." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Por favor, corrija os erros abaixo." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Adicionar %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtro" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Remover da ordenação" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioridade da ordenação: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Alternar ordenção" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Apagar" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -501,7 +515,7 @@ "de objetos relacionados, mas sua conta não tem a permissão para remoção dos " "seguintes tipos de objetos:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -510,7 +524,7 @@ "Excluir o %(object_name)s ' %(escaped_object)s ' exigiria excluir os " "seguintes objetos protegidos relacionados:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -519,16 +533,16 @@ "Você tem certeza que quer remover %(object_name)s \"%(escaped_object)s\"? " "Todos os seguintes itens relacionados serão removidos:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Sim, tenho certeza" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Remover múltiplos objetos" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -539,7 +553,7 @@ "relacionados, mas sua conta não tem permissão para excluir os seguintes " "tipos de objetos:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -548,7 +562,7 @@ "Excluir o %(objects_name)s selecionado exigiria excluir os seguintes objetos " "relacionados protegidos:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -557,41 +571,56 @@ "Tem certeza de que deseja apagar o %(objects_name)s selecionado? Todos os " "seguintes objetos e seus itens relacionados serão removidos:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Remover" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Adicionar outro(a) %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Apagar?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Por %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modelos na aplicação %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Modificar" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Você não tem permissão para edição." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Ações Recentes" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Minhas Ações" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nenhum disponível" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Conteúdo desconhecido" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -601,27 +630,27 @@ "que as tabelas necessárias foram criadas e que o banco de dados pode ser " "acessado pelo usuário apropriado." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Senha:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Esqueceu sua senha ou nome de usuário?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Data/hora" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Usuário" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Ação" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -629,112 +658,61 @@ "Este objeto não tem um histórico de alterações. Ele provavelmente não foi " "adicionado por este site de administração." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Mostrar tudo" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Salvar" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Pesquisar" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultado" msgstr[1] "%(counter)s resultados" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Salvar como novo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Salvar e adicionar outro(a)" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Salvar e continuar editando" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Primeiro, informe um nome de usuário e senha. Depois você será capaz de " -"editar mais opções do usuário." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Digite um nome de usuário e senha." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Informe uma nova senha para o usuário %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Senha" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Senha (novamente)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Informe a mesma senha digitada acima, para verificação." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Remover" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Adicionar outro(a) %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Apagar?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Obrigado por visitar nosso Web site hoje." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Acessar novamente" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Alterar senha" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Senha alterada com sucesso" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Sua senha foi alterada." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -742,46 +720,34 @@ "Por favor, informe sua senha antiga, por segurança, e então informe sua nova " "senha duas vezes para que possamos verificar se você digitou corretamente." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Senha antiga" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nova senha" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Alterar minha senha" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Recuperar senha" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Recuperação de senha completa" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Sua senha foi definida. Você pode prosseguir e se autenticar agora." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmação de recuperação de senha" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Insira a nova senha" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -789,19 +755,15 @@ "Por favor, informe sua nova senha duas vezes para que possamos verificar se " "você a digitou corretamente." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nova senha:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirme a senha:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Recuperação de senha sem sucesso" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -809,12 +771,7 @@ "O link para a recuperação de senha era inválido, possivelmente porque jã foi " "utilizado. Por favor, solicite uma nova recuperação de senha." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Senha recuperada com sucesso" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -822,7 +779,7 @@ "Nós te enviamos as instruções para definição da sua senha para o endereço de " "email fornecido. Você receberá a mensagem em instantes." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -830,7 +787,7 @@ "Se você não receber um e-mail, por favor verifique se você digitou o " "endereço que você usou para se registrar, e verificar a sua pasta de spam." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -839,24 +796,24 @@ "Você está recebendo este email porque solicitou a redefinição da senha da " "sua conta em %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Por favor, acesse a seguinte página e escolha uma nova senha:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Seu nome de usuário, caso tenha esquecido:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Obrigado por usar nosso site!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Equipe %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -864,28 +821,52 @@ "Esqueceu a senha? Forneça o seu endereço de email abaixo e te enviaremos " "instruções para definir uma nova." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Endereço de email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Reinicializar minha senha" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Todas as datas" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nenhum)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Selecione %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Selecione %s para modificar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Data:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Hora:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Olhar" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Adicionar Outro(a)" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Atualmente:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Alterar:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ro/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,11 +7,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/" "ro/)\n" "MIME-Version: 1.0\n" @@ -21,12 +21,12 @@ "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" "2:1));\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s disponibil" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -36,38 +36,38 @@ "in chenarul de mai jos și apăsând pe săgeata \"Alege\" dintre cele două " "chenare." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Scrie în acest chenar pentru a filtra lista de %s disponibile." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtru" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Alege toate" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Click pentru a alege toate %s." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Alege" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Elimină" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s alese" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -77,23 +77,25 @@ "chenarul de mai jos și apasand pe săgeata \"Elimină\" dintre cele două " "chenare." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Elimină toate" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Click pentru a elimina toate %s alese." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s din %(cnt)s selectate" msgstr[1] "%(sel)s din %(cnt)s selectate" msgstr[2] "de %(sel)s din %(cnt)s selectate" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -101,7 +103,8 @@ "Aveţi modificări nesalvate în cîmpuri individuale editabile. Dacă executaţi " "o acțiune, modificările nesalvate vor fi pierdute." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -111,7 +114,8 @@ "individuale. Faceţi clic pe OK pentru a salva. Va trebui să executați " "acțiunea din nou." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -120,70 +124,88 @@ "Ați selectat o acţiune și nu ațţi făcut modificări în cîmpuri individuale. " "Probabil căutați butonul Go, în loc de Salvează." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Ianuarie Februare Martie Aprilie Mai Iunie Iulie August Septembrie Octombrie " -"Noiembrie Decembrie" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D L M M J V S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Arată" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ascunde" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Acum" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Ceas" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Alege o oră" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Miezul nopții" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Amiază" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Anulează" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Astăzi" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Calendar" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Ieri" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Mâine" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Ianuarie Februare Martie Aprilie Mai Iunie Iulie August Septembrie Octombrie " +"Noiembrie Decembrie" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D L M M J V S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Arată" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ascunde" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ro/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ro/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ro/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ro/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ro/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -2,15 +2,15 @@ # # Translators: # Daniel Ursache-Dogariu , 2011 -# Denis Darii , 2011 +# Denis Darii , 2011,2014 # Ionel Cristian Mărieș , 2012 # 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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Romanian (http://www.transifex.com/projects/p/django/language/" "ro/)\n" @@ -21,156 +21,159 @@ "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?" "2:1));\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s eliminate cu succes." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Nu se poate șterge %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Sigur?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Elimină %(verbose_name_plural)s selectate" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Toate" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Da" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nu" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Necunoscut" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Orice dată" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Astăzi" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Ultimele 7 zile" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Luna aceasta" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Anul acesta" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Autentificațți-vă din nou, deoarece sesiunea dumneavoastră a expirat." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Acțiune:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "timp acțiune" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id obiect" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "repr obiect" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "marcaj acțiune" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "schimbă mesaj" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "intrare jurnal" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "intrări jurnal" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "S-au adăugat \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "S-au schimbat \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "S-au șters \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Obiect LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Nimic" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "S-a schimbat %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "și" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "S-a adăugat %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "S-a schimbat %(list)s în %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "S-a șters %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Niciun câmp modificat." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -178,38 +181,38 @@ "%(name)s \"%(obj)s\" a fost adăugat(ă) cu succes. Puteți edita din nou mai " "jos." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" a fost adăugat cu succes." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" a fost modificat(ă) cu succes." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -217,30 +220,35 @@ "Itemii trebuie selectați pentru a putea îndeplini sarcini asupra lor. Niciun " "item nu a fost modificat." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nicio acțiune selectată." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Adaugă %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" eliminat(ă) cu succes." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Obiectul %(name)s ce are cheie primară %(key)r nu există." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Adaugă %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Schimbă %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Eroare de bază de date" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -248,7 +256,7 @@ msgstr[1] "%(count)s %(name)s s-au modificat cu succes." msgstr[2] "%(count)s de %(name)s s-au modificat cu succes." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -256,231 +264,236 @@ msgstr[1] "Toate %(total_count)s selectate" msgstr[2] "Toate %(total_count)s selectate" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 din %(cnt)s selectat" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" eliminat(ă) cu succes." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Istoric schimbări: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Autentificare" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Administrare sit Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administrare Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administrare site" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administrare %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dată:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Oră:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Căutare" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Mai adăugați" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Autentificare" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Pagină inexistentă" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Ne pare rău, dar pagina solicitată nu a putut fi găsită." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Acasă" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Eroare de server" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Eroare de server (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Eroare server (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Pornește acțiunea selectată" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Start" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Clic aici pentru a selecta obiectele la nivelul tuturor paginilor" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Selectați toate %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Deselectați" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Introduceți mai întâi un nume de utilizator și o parolă. Apoi veți putea " +"modifica mai multe opțiuni ale utilizatorului." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Introduceți un nume de utilizator și o parolă." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Schimbă parola" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Corectați erorile de mai jos" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Corectați erorile de mai jos." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Introduceți o parolă nouă pentru utilizatorul %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Parolă" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Parolă (din nou)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Introduceți parola din nou, pentru verificare." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Bun venit," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Documentație" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Schimbă parola" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Deautentificare" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Administrare sit Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrare Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Adaugă" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Istoric" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Vizualizează pe sit" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Corectați erorile de mai jos" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Adaugă %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtru" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Elimină din sortare" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritate sortare: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Alternează sortarea" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Șterge" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -491,7 +504,7 @@ "obiectelor asociate, însă contul dumneavoastră nu are permisiunea de a " "șterge următoarele tipuri de obiecte:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -500,7 +513,7 @@ "Ștergerea %(object_name)s '%(escaped_object)s' ar putea necesita și " "ștergerea următoarelor obiecte protejate asociate:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -509,16 +522,16 @@ "Sigur doriți ștergerea %(object_name)s \"%(escaped_object)s\"? Următoarele " "itemuri asociate vor fi șterse:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Da, cu siguranță" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Ștergeți obiecte multiple" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -529,7 +542,7 @@ "obiectelor asociate, însă contul dvs. de utilizator nu are permisiunea de a " "șterge următoarele tipuri de obiecte:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -538,7 +551,7 @@ "Ştergerea %(objects_name)s conform selecției ar necesita și ștergerea " "următoarelor obiecte protejate asociate:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -547,41 +560,56 @@ "Sigur doriţi să ștergeți %(objects_name)s conform selecției? Toate obiectele " "următoare alături de cele asociate lor vor fi șterse:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Elimină" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Adăugati încă un/o %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Elimină?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "După %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Schimbă" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nu nicio permisiune de editare." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Acțiuni recente" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Acțiunile mele" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Niciuna" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Conținut necunoscut" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -591,27 +619,27 @@ "baza de date au fost create și verificați dacă baza de date poate fi citită " "de utilizatorul potrivit." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Parolă:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Ați uitat parola sau utilizatorul ?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dată/oră" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Utilizator" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Acțiune" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -619,19 +647,20 @@ "Acest obiect nu are un istoric al schimbărilor. Probabil nu a fost adăugat " "prin intermediul acestui sit de administrare." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Arată totul" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Salvează" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Caută" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -639,94 +668,41 @@ msgstr[1] "%(counter)s rezultate" msgstr[2] "%(counter)s de rezultate" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s în total" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Salvați ca nou" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Salvați și mai adăugați" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Salvați și continuați editarea" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Introduceți mai întâi un nume de utilizator și o parolă. Apoi veți putea " -"modifica mai multe opțiuni ale utilizatorului." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Introduceți un nume de utilizator și o parolă." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Introduceți o parolă nouă pentru utilizatorul %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Parolă" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Parolă (din nou)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Introduceți parola din nou, pentru verificare." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Elimină" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Adăugati încă un/o %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Elimină?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Mulţumiri pentru timpul petrecut astăzi pe sit." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Reautentificare" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Schimbare parolă" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Schimbare reușită a parolei" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Parola a fost schimbată." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -734,48 +710,36 @@ "Din motive de securitate, introduceți parola veche, apoi de două ori parola " "nouă, pentru a putea verifica dacă ați scris-o corect. " -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Parolă veche" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Parolă nouă" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Schimbă-mi parola" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Resetare parolă" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Resetare completă a parolei" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Parola dumneavoastră a fost stabilită. Acum puteți continua să vă " "autentificați." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Confirmare resetare parolă" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Introduceți parolă nouă" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -783,19 +747,15 @@ "Introduceți parola de două ori, pentru a putea verifica dacă ați scris-o " "corect." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Parolă nouă:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Confirmare parolă:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Resetare nereușită a parolei" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -803,75 +763,94 @@ "Link-ul de resetare a parolei a fost nevalid, probabil din cauză că acesta a " "fost deja utilizat. Solicitați o nouă resetare a parolei." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Parolă resetată cu succes" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Mergeți la următoarea pagină și alegeți o parolă nouă:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Numele de utilizator, în caz că l-ați uitat:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Mulțumiri pentru utilizarea sitului nostru!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Echipa %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "" +msgstr "Adresă e-mail:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Resetează-mi parola" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Toate datele" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Nimic)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Selectează %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Selectează %s pentru schimbare" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dată:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Oră:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Căutare" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Mai adăugați" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "În prezent:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Schimbă:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ru/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,14 +5,14 @@ # Dimmus , 2011 # Eugene MechanisM , 2012 # Jannis Leidel , 2011 -# Алексей Борискин , 2012 +# Алексей Борискин , 2012,2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-16 16:08+0000\n" +"Last-Translator: Алексей Борискин \n" "Language-Team: Russian (http://www.transifex.com/projects/p/django/language/" "ru/)\n" "MIME-Version: 1.0\n" @@ -22,12 +22,12 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Доступные %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -36,39 +36,39 @@ "Это список всех доступных %s. Вы можете выбрать некоторые из них, выделив их " "в поле ниже и кликнув \"Выбрать\", либо двойным щелчком." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" "Начните вводить текст в этом поле, чтобы отфитровать список доступных %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Фильтр" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Выбрать все" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Нажмите, чтобы выбрать все %s сразу." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Выбрать" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Удалить" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Выбранные %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -77,23 +77,25 @@ "Это список выбранных %s. Вы можете удалить некоторые из них, выделив их в " "поле ниже и кликнув \"Удалить\", либо двойным щелчком." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Удалить все" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Нажмите чтобы удалить все %s сразу." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Выбран %(sel)s из %(cnt)s" msgstr[1] "Выбрано %(sel)s из %(cnt)s" msgstr[2] "Выбрано %(sel)s из %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -101,7 +103,8 @@ "Имеются несохраненные изменения в отдельных полях для редактирования. Если " "вы запустите действие, несохраненные изменения будут потеряны." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -111,7 +114,8 @@ "полях для редактирования. Нажмите OK, чтобы сохранить изменения. После " "сохранения вам придется запустить действие еще раз." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -121,70 +125,91 @@ "воспользоваться кнопкой \"Выполнить\", а не кнопкой \"Сохранить\". Если это " "так, то нажмите \"Отмена\", чтобы вернуться в интерфейс редактирования. " -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Январь Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь " -"Декабрь" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "В П В С Ч П С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Показать" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Скрыть" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Внимание: Ваше локальное время опережает время сервера на %s час." +msgstr[1] "Внимание: Ваше локальное время опережает время сервера на %s часа." +msgstr[2] "Внимание: Ваше локальное время опережает время сервера на %s часов." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +"Внимание: Ваше локальное время отстаёт от времени сервера на %s час." +msgstr[1] "" +"Внимание: Ваше локальное время отстаёт от времени сервера на %s часа." +msgstr[2] "" +"Внимание: Ваше локальное время отстаёт от времени сервера на %s часов." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Сейчас" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Часы" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Выберите время" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Полночь" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 часов" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Полдень" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Отмена" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Сегодня" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Календарь" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Вчера" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Завтра" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Январь Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь " +"Декабрь" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "В П В С Ч П С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Показать" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Скрыть" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ru/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ru/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ru/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ru/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ru/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: -# defuz , 2013 +# Ivan Ivaschenko , 2013 # Denis Darii , 2011 # Dimmus , 2011 # Jannis Leidel , 2011 -# Алексей Борискин , 2012-2013 +# Алексей Борискин , 2012-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-07 12:41+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-06-16 21:09+0000\n" "Last-Translator: Алексей Борискин \n" "Language-Team: Russian (http://www.transifex.com/projects/p/django/language/" "ru/)\n" @@ -22,62 +22,68 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно удалены %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Не удается удалить %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Вы уверены?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Удалить выбранные %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Администрирование" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Все" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Да" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Нет" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Неизвестно" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Любая дата" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Сегодня" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Последние 7 дней" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Этот месяц" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Этот год" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -86,94 +92,91 @@ "Пожалуйста, введите корректные %(username)s и пароль для аккаунта. Оба поля " "могут быть чувствительны к регистру." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Пожалуйста, войдите снова, поскольку ваша сессия устарела." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Действие:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "время действия" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "идентификатор объекта" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "представление объекта" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "тип действия" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "сообщение об изменении" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "запись в журнале" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "записи в журнале" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Добавлено \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Изменено \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Удалено \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Запись в журнале" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Нет" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Изменен %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "и" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Добавлен %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Изменены %(list)s для %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Удален %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Ни одно поле не изменено." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -181,7 +184,7 @@ "%(name)s \"%(obj)s\" был успешно добавлен. Ниже вы можете снова его " "отредактировать." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +192,12 @@ msgstr "" "%(name)s \"%(obj)s\" успешно добавлен. Ниже вы можете добавить еще %(name)s." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" был успешно добавлен." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -202,7 +205,7 @@ msgstr "" "%(name)s \"%(obj)s\" успешно изменен. Ниже вы можете редактировать снова." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ msgstr "" "%(name)s \"%(obj)s\" успешно изменен. Ниже вы можете добавить еще %(name)s." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" был успешно изменен." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,30 +226,35 @@ "Чтобы произвести действия над объектами, необходимо их выбрать. Объекты не " "были изменены." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Действие не выбрано." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Добавить %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" был успешно удален." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s с первичным ключом %(key)r не существует." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Добавить %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Изменить %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Ошибка базы данных" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -254,7 +262,7 @@ msgstr[1] "%(count)s %(name)s были успешно изменены." msgstr[2] "%(count)s %(name)s были успешно изменены." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -262,29 +270,24 @@ msgstr[1] "Выбраны все %(total_count)s" msgstr[2] "Выбраны все %(total_count)s" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Выбрано 0 объектов из %(cnt)s " -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" был успешно удален." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "История изменений: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -293,83 +296,71 @@ "Удаление объекта %(instance)s типа %(class_name)s будет требовать удаления " "следующих связанных объектов: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Войти" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Административный сайт Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Администрирование Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Администрирование сайта" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s администрирование" - -#: widgets.py:90 -msgid "Date:" -msgstr "Дата:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Время:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Поиск" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Добавить еще" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Сейчас:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Войти" -#: widgets.py:303 -msgid "Change:" -msgstr "Изменить:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Администрирование приложения «%(app)s»" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Страница не найдена" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "К сожалению, запрашиваемая вами страница не найдена." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Начало" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Ошибка сервера" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Ошибка сервера (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Ошибка сервера (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -377,120 +368,141 @@ "Произошла ошибка. О ней сообщено администраторам сайта по электронной почте, " "ошибка должна быть вскоре исправлена. Благодарим вас за терпение." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Выполнить выбранное действие" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Выполнить" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Нажмите здесь, чтобы выбрать объекты на всех страницах" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Выбрать все %(module_name)s (%(total_count)s)" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Снять выделение" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Сначала введите имя пользователя и пароль. Затем вы сможете ввести больше " +"информации о пользователе." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Введите имя пользователя и пароль." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Изменить пароль" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Пожалуйста, исправьте ошибки ниже." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Пожалуйста, исправьте ошибки ниже." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Введите новый пароль для пользователя %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Пароль" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Пароль (еще раз)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Введите тот же пароль, что и выше, для подтверждения." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Добро пожаловать," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документация" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Изменить пароль" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Выйти" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Административный сайт Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Администрирование Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Добавить" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "История" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Смотреть на сайте" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Пожалуйста, исправьте ошибки ниже." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Пожалуйста, исправьте ошибки ниже." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Добавить %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Фильтр" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Удалить из сортировки" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Приоритет сортировки: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Сортировать в другом направлении" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Удалить" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -501,7 +513,7 @@ "объектов, но ваша учетная запись не имеет прав для удаления следующих типов " "объектов:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -510,7 +522,7 @@ "Удаление %(object_name)s '%(escaped_object)s' потребует удаления следующих " "связанных защищенных объектов:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -519,16 +531,16 @@ "Вы уверены, что хотите удалить %(object_name)s \"%(escaped_object)s\"? Все " "следующие связанные объекты также будут удалены:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Да, я уверен" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Удалить несколько объектов" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -538,7 +550,7 @@ "Удаление выбранной %(objects_name)s приведет к удалению связанных объектов, " "но ваша учетная запись не имеет прав на удаление следующих типов объектов:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -547,7 +559,7 @@ "Удаление %(objects_name)s потребует удаления следующих связанных защищенных " "объектов:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -556,41 +568,56 @@ "Вы уверены, что хотите удалить %(objects_name)s? Все следующие объекты и " "связанные с ними элементы будут удалены:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Удалить" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Добавить еще один %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Удалить?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Модели в приложении %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Изменить" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "У вас недостаточно прав для редактирования." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Последние действия" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Мои действия" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Недоступно" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Неизвестный тип" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -600,27 +627,27 @@ "таблицы были созданы, и что соответствующему пользователю разрешен к ним " "доступ." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Пароль:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Забыли свой пароль или имя пользователя?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Дата и время" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Пользователь" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Действие" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -628,19 +655,20 @@ "Данный объект не имеет истории изменений. Возможно, он был добавлен не через " "данный административный сайт." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Показать все" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Сохранить" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Найти" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -648,93 +676,41 @@ msgstr[1] "%(counter)s результата" msgstr[2] "%(counter)s результатов" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s всего" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Сохранить как новый объект" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Сохранить и добавить другой объект" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Сохранить и продолжить редактирование" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Сначала введите имя пользователя и пароль. Затем вы сможете ввести больше " -"информации о пользователе." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Введите имя пользователя и пароль." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Введите новый пароль для пользователя %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Пароль" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Пароль (еще раз)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Введите тот же пароль, что и выше, для подтверждения." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Удалить" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Добавить еще один %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Удалить?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Благодарим вас за время, проведенное на этом сайте." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Войти снова" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Изменение пароля" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Пароль успешно изменен" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ваш пароль был изменен." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -742,46 +718,34 @@ "В целях безопасности, пожалуйста, введите свой старый пароль, затем введите " "новый пароль дважды, чтобы мы могли убедиться в правильности написания." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Старый пароль" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Новый пароль" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Изменить мой пароль" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Восстановление пароля" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Восстановление пароля завершено" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Ваш пароль был сохранен. Теперь вы можете войти." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Подтверждение восстановления пароля" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Введите новый пароль:" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -789,19 +753,15 @@ "Пожалуйста, введите новый пароль дважды, чтобы мы могли убедиться в " "правильности написания." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Новый пароль:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Подтвердите пароль:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Ошибка восстановления пароля" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -809,12 +769,7 @@ "Неверная ссылка для восстановления пароля. Возможно, ей уже воспользовались. " "Пожалуйста, попробуйте восстановить пароль еще раз." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Пароль успешно восстановлен" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -822,7 +777,7 @@ "Мы отправили вам инструкцию по установке пароля на указанный адрес " "электронной почты. Вы должны получить ее в ближайшее время." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -830,7 +785,7 @@ "Если вы не получили письмо, пожалуйста, убедитесь, что вы ввели адрес с " "которым Вы зарегистрировались, и проверьте папку со спамом." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -840,24 +795,24 @@ "восстановление пароля от учётной записи на сайте %(site_name)s, которая " "связана с этим адресом электронной почты." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Пожалуйста, перейдите на эту страницу и введите новый пароль:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Ваше имя пользователя (на случай, если вы его забыли):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Спасибо, что используете наш сайт!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Команда сайта %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -865,28 +820,52 @@ "Забыли пароль? Введите свой адрес электронной почты ниже, и мы вышлем вам " "инструкцию, как установить новый пароль." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Адрес электронной почты:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Восстановить мой пароль" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Все даты" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ничего)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Выберите %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Выберите %s для изменения" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Дата:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Время:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Поиск" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Добавить еще" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Сейчас:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Изменить:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sk/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,14 +5,14 @@ # Jannis Leidel , 2011 # Juraj Bubniak , 2012 # Marian Andre , 2012 -# Martin Kosír , 2011 +# Martin Kosír, 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/" "sk/)\n" "MIME-Version: 1.0\n" @@ -21,12 +21,12 @@ "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Dostupné %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +35,38 @@ "Toto je zoznam dostupných %s. Pre výber je potrebné označiť ich v poli a " "následne kliknutím na šípku \"Vybrať\" presunúť." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Píšte do tohto poľa pre vyfiltrovanie dostupných %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtrovať" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Vybrať všetko" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Kliknite sem pre vybratie všetkých %s naraz." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Vybrať" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Odstrániť" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Vybrané %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,23 +75,25 @@ "Toto je zoznam dostupných %s. Pre vymazanie je potrebné označiť ich v poli a " "následne kliknutím na šípku \"Vymazať\" vymazať." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Odstrániť všetky" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Kliknite sem pre vymazanie vybratých %s naraz." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s z %(cnt)s vybrané" msgstr[1] "%(sel)s z %(cnt)s vybrané" msgstr[2] "%(sel)s z %(cnt)s vybraných" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +101,8 @@ "Vrámci jednotlivých editovateľných polí máte neuložené zmeny. Ak vykonáte " "akciu, vaše zmeny budú stratené." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "Vybrali ste akciu, ale neuložili ste jednotlivé polia. Prosím, uložte zmeny " "kliknutím na OK. Akciu budete musieť vykonať znova." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +121,88 @@ "Vybrali ste akciu, ale neurobili ste žiadne zmeny v jednotlivých poliach. " "Pravdepodobne ste chceli použiť tlačidlo vykonať namiesto uložiť." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"január február marec apríl máj jún júl august september október november " -"december" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "N P U S Š P S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Zobraziť" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Skryť" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Teraz" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Hodiny" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Vybrať čas" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Polnoc" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6:00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Poludnie" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Zrušiť" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Dnes" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendár" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Včera" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Zajtra" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"január február marec apríl máj jún júl august september október november " +"december" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "N P U S Š P S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Zobraziť" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Skryť" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sk/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sk/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sk/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -3,14 +3,14 @@ # Translators: # Jannis Leidel , 2011 # Juraj Bubniak , 2012-2013 -# Marian Andre , 2013 -# Martin Kosír , 2011 +# Marian Andre , 2013-2014 +# Martin Kosír, 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-10 12:53+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-16 20:16+0000\n" "Last-Translator: Marian Andre \n" "Language-Team: Slovak (http://www.transifex.com/projects/p/django/language/" "sk/)\n" @@ -20,62 +20,68 @@ "Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Úspešne zmazaných %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Nedá sa vymazať %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ste si istý?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Zmazať označené %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Správa" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Všetko" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Áno" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nie" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Neznámy" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Ľubovoľný dátum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Dnes" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Posledných 7 dní" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Tento mesiac" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Tento rok" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,94 +90,91 @@ "Zadajte prosím správne %(username)s a heslo pre účet personálu - \"staff " "account\". Obe polia môžu obsahovať veľké a malé písmená." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Vaše prihlásenie vypršalo. Prosím, prihláste sa znovu." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Akcia:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "čas akcie" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "identifikátor objektu" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "reprezentácia objektu" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "príznak akcie" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "zmeniť správu" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "položka záznamu" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "položky záznamu" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Pridané \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Zmenené \" %(object)s \" - %(changes)s " -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Odstránené \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objekt LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Žiadne" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Zmenené %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "a" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Pridaný %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Zmenený %(list)s pre %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Zmazaný %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Polia nezmenené." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -179,7 +182,7 @@ "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný. Ďalšie zmeny môžete urobiť " "nižšie." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,12 +191,12 @@ "%(name)s \"%(obj)s\" bol úspešne pridaný. Môžete pridať ďaľší %(name)s " "nižšie." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne pridaný." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ msgstr "" "%(name)s \"%(obj)s\" bol úspešne zmenený. Môžete ho znovu upraviť nižšie." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "%(name)s \"%(obj)s\" bol úspešne zmenený. Môžete pridať ďaľšie %(name)s " "nižšie." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne zmenený." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,30 +226,35 @@ "Položky musia byť vybrané, ak chcete na nich vykonať akcie. Neboli vybrané " "žiadne položky." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nebola vybraná žiadna akcia." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Pridať %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s s primárnym kľúčom %(key)r neexistuje." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Pridať %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Zmeniť %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Chyba databázy" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -254,7 +262,7 @@ msgstr[1] "%(count)s %(name)s boli úspešne zmenené." msgstr[2] "%(count)s %(name)s bolo úspešne zmenených." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -262,29 +270,24 @@ msgstr[1] "Všetky %(total_count)s vybrané" msgstr[2] "Všetkých %(total_count)s vybraných" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 z %(cnt)s vybraných" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Objekt %(name)s \"%(obj)s\" bol úspešne vymazaný." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Zmeniť históriu: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -293,83 +296,71 @@ "Vymazanie %(class_name)s %(instance)s vyžaduje vymazanie nasledovných " "súvisiacich chránených objektov: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Prihlásenie" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Správa Django stránky" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Správa Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Správa stránky" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s správa" - -#: widgets.py:90 -msgid "Date:" -msgstr "Dátum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Čas:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Vyhľadanie" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Pridať ďalší" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Aktuálne:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Prihlásenie" -#: widgets.py:303 -msgid "Change:" -msgstr "Zmeniť:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s správa" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Stránka nenájdená" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Ľutujeme, ale požadovanú stránku nie je možné nájsť." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Domov" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Chyba servera" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Chyba servera (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Chyba servera (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -377,120 +368,141 @@ "Došlo k chybe. Chyba bola nahlásená správcovi webu prostredníctvom e-mailu a " "zanedlho by mala byť odstránená. Ďakujeme za vašu trpezlivosť." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Vykonať vybranú akciu" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Vykonať" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kliknite sem pre výber objektov na všetkých stránkach" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Vybrať všetkých %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Zrušiť výber" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Najskôr zadajte používateľské meno a heslo. Potom budete môcť upraviť viac " +"používateľských nastavení." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Zadajte používateľské meno a heslo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Zmeniť heslo" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Prosím, opravte chyby uvedené nižšie." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Prosím, opravte chyby uvedené nižšie." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Zadajte nové heslo pre používateľa %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Heslo" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Heslo (znova)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Vitajte," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentácia" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Zmeniť heslo" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Odhlásiť" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Správa Django stránky" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Správa Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Pridať" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "História" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Pozrieť na stránke" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Prosím, opravte chyby uvedené nižšie." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Prosím, opravte chyby uvedené nižšie." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Pridať %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrovať" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Odstrániť z triedenia" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Triedenie priority: %(priority_number)s " -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Prepnúť triedenie" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Odstrániť" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -501,7 +513,7 @@ "aj odstránenie súvisiacich objektov. Váš účet však nemá oprávnenie na " "odstránenie nasledujúcich typov objektov:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -510,7 +522,7 @@ "Vymazanie %(object_name)s '%(escaped_object)s' vyžaduje vymazanie " "nasledovných súvisiacich chránených objektov:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -519,16 +531,16 @@ "Ste si istý, že chcete odstrániť objekt %(object_name)s \"%(escaped_object)s" "\"? Všetky nasledujúce súvisiace objekty budú odstránené:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Áno, som si istý" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Zmazať viacero objektov" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -539,7 +551,7 @@ "objektov, ale váš účet nemá oprávnenie na vymazanie nasledujúcich typov " "objektov:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -548,7 +560,7 @@ "Vymazanie označených %(objects_name)s vyžaduje vymazanie nasledujúcich " "chránených súvisiacich objektov:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -557,41 +569,56 @@ "Ste si isty, že chcete vymazať označené %(objects_name)s? Vymažú sa všetky " "nasledujúce objekty a ich súvisiace položky:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Odstrániť" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Pridať ďalší %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Zmazať?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Podľa %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modely v %(name)s aplikácii" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Zmeniť" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nemáte právo na vykonávanie zmien." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Posledné akcie" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Moje akcie" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nedostupné" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Neznámy obsah" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -601,27 +628,27 @@ "vytvorené potrebné databázové tabuľky a taktiež skontrolujte, či príslušný " "používateľ môže databázu čítať." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Heslo:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Zabudli ste heslo alebo používateľské meno?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Dátum a čas" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Používateľ" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Akcia" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -629,19 +656,20 @@ "Tento objekt nemá históriu zmien. Pravdepodobne nebol pridaný " "prostredníctvom tejto správcovskej stránky." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Zobraziť všetky" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Uložiť" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Vyhľadávanie" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -649,93 +677,41 @@ msgstr[1] "%(counter)s výsledky" msgstr[2] "%(counter)s výsledkov" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s spolu" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Uložiť ako nový" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Uložiť a pridať ďalší" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Uložiť a pokračovať v úpravách" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Najskôr zadajte používateľské meno a heslo. Potom budete môcť upraviť viac " -"používateľských nastavení." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Zadajte používateľské meno a heslo." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Zadajte nové heslo pre používateľa %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Heslo" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Heslo (znova)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Kvôli overeniu zadajte rovnaké heslo ako vyššie." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Odstrániť" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Pridať ďalší %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Zmazať?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Ďakujeme za čas strávený na našich stránkach." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Znova sa prihlásiť" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Zmena hesla" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Zmena hesla úspešná" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Vaše heslo bolo zmenené." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -743,65 +719,49 @@ "Z bezpečnostných dôvodov zadajte staré heslo a potom nové heslo dvakrát, aby " "sme mohli overiť, že ste ho zadali správne." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Staré heslo" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nové heslo" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Zmeniť moje heslo" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Obnovenie hesla" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Obnovenie hesla ukončené" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Vaše heslo bolo nastavené. Môžete pokračovať a prihlásiť sa." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potvrdenie obnovenia hesla" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Zadajte nové heslo" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" "Zadajte nové heslo dvakrát, aby sme mohli overiť, že ste ho zadali správne." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nové heslo:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potvrdenie hesla:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Obnova hesla sa nepodarila" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -809,12 +769,7 @@ "Odkaz na obnovenie hesla je neplatný, pretože už bol pravdepodobne raz " "použitý. Prosím, požiadajte znovu o obnovu hesla." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Obnovenie hesla úspešné" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -822,7 +777,7 @@ "Na e-mailovú adresu, ktorú ste zadali, sme odoslali pokyny pre nastavenie " "hesla. Mali by ste ho dostať čoskoro." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -830,7 +785,7 @@ "Ak ste nedostali email, uistite sa, že ste zadali adresu, s ktorou ste sa " "registrovali a skontrolujte svoj spamový priečinok." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -839,24 +794,24 @@ "Tento e-mail ste dostali preto, lebo ste požiadali o obnovenie hesla pre " "užívateľský účet na %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Prosím, choďte na túto stránku a zvoľte si nové heslo:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Vaše používateľské meno, pre prípad, že ste ho zabudli:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Ďakujeme, že používate našu stránku!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Tím %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -864,28 +819,52 @@ "Zabudli ste heslo? Zadajte svoju e-mailovú adresu a my vám pošleme " "inštrukcie pre nastavenie nového hesla." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-mailová adresa:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Obnova môjho hesla" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Všetky dátumy" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Žiadne)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Vybrať %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Vybrať \"%s\" na úpravu" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Dátum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Čas:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Vyhľadanie" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Pridať ďalší" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Aktuálne:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Zmeniť:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sl/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # zejn , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/django/" "language/sl/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Možne %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "To je seznam možnih %s. Izbrane lahko izberete z izbiro v spodnjem okvirju " "in s klikom na puščico \"Izberi\" med okvirjema." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Z vpisom niza v to polje, zožite izbor %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtriraj" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Izberi vse" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Kliknite za izbor vseh %s hkrati." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Izberi" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Odstrani" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Izbran %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,16 +73,17 @@ "To je seznam možnih %s. Odvečne lahko odstranite z izbiro v okvirju in " "klikom na puščico \"Odstrani\" med okvirjema." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Odstrani vse" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Kliknite za odstranitev vseh %s hkrati." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s od %(cnt)s izbranih" @@ -90,7 +91,8 @@ msgstr[2] "%(sel)s od %(cnt)s izbrana" msgstr[3] "%(sel)s od %(cnt)s izbrani" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +100,8 @@ "Na nekaterih poljih, kjer je omogočeno urejanje, so neshranjene spremembe. V " "primeru nadaljevanja bodo neshranjene spremembe trajno izgubljene." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "Kliknite na 'V redu', da boste shranili. Dejanje boste morali ponovno " "izvesti." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +121,90 @@ "Izbrali ste dejanje, vendar niste naredili nobenih sprememb na posameznih " "poljih. Verjetno iščete gumb Pojdi namesto Shrani." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januar Februar Marec April Maj Junij Julij Avgust September Oktober November " -"December" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "N P T S Č P S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Prikaži" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Skrij" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" +msgstr[3] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Takoj" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Ura" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Izbor časa" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Polnoč" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "Ob 6h" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Opoldne" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Prekliči" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Danes" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Koledar" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Včeraj" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Jutri" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januar Februar Marec April Maj Junij Julij Avgust September Oktober November " +"December" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "N P T S Č P S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Prikaži" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Skrij" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sl/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sl/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sl/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sl/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sl/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -6,11 +6,11 @@ # zejn , 2011-2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-23 14:16+0000\n" -"Last-Translator: zejn \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-14 17:11+0000\n" +"Last-Translator: Claude Paroz \n" "Language-Team: Slovenian (http://www.transifex.com/projects/p/django/" "language/sl/)\n" "MIME-Version: 1.0\n" @@ -20,62 +20,68 @@ "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" "%100==4 ? 2 : 3);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspešno izbrisano %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Ni mogoče izbrisati %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ste prepričani?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Izbriši izbrano: %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Vse" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Da" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Neznano" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Kadarkoli" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Danes" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Zadnjih 7 dni" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ta mesec" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Letos" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,101 +90,98 @@ "Vnesite veljavno %(username)s in geslo za račun osebja. Opomba: obe polji " "upoštevata velikost črk." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Vaša seja je pretekla; prosimo da se ponovno prijavite." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Dejanje:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "čas dejanja" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id objekta" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "predstavitev objekta" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "zastavica dejanja" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "spremeni sporočilo" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "dnevniški vnos" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "dnevniški vnosi" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Dodan \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Spremenjen \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Izbrisan \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Dnevniški vnos" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Brez vrednosti" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Spremenjen %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "in" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Dodal %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Spremenjeno %(list)s za %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Izbrisan %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nobeno polje ni bilo spremenjeno." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" je bil uspešno dodan. Ponovno ga lahko uredite spodaj." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -187,12 +190,12 @@ "%(name)s \"%(obj)s\" je bil uspešno dodan. Spodaj lahko dodate še kak " "%(name)s." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" je bil uspešno dodan." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -201,7 +204,7 @@ "%(name)s \"%(obj)s\" je bil uspešno posodobljen. Spodaj ga lahko urejate še " "dalje." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,12 +213,12 @@ "%(name)s \"%(obj)s\" je bil uspešno posodobljen. Spodaj lahko dodate še kak " "%(name)s." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" je bil uspešno spremenjen." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -223,30 +226,35 @@ "Izbrati morate vnose, nad katerimi želite izvesti operacijo. Noben vnos ni " "bil spremenjen." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Brez dejanja." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Dodaj %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" je bil uspešno izbrisan." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekt %(name)s z glavnim ključem %(key)r ne obstaja." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Dodaj %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Spremeni %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Napaka v podatkovni bazi" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -255,7 +263,7 @@ msgstr[2] "%(count)s %(name)s so bili uspešno spremenjeni." msgstr[3] "%(count)s %(name)s je bilo uspešno spremenjenih." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -264,114 +272,95 @@ msgstr[2] "%(total_count)s izbrani" msgstr[3] "%(total_count)s izbranih" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s izbranih" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" je bil uspešno izbrisan." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Zgodovina sprememb: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Brisanje %(object_name)s '%(escaped_object)s' bi zahtevalo brisanje " -"naslednjih zaščitenih povezanih objektov:" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Prijavite se" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administrativni vmesnik" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administracija" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administracija strani" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administracija %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Ura:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Poizvedba" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Dodaj še enega" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Trenutno:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Prijavite se" -#: widgets.py:303 -msgid "Change:" -msgstr "Spremembe:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Strani ni mogoče najti" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Opravičujemo se, a zahtevane strani ni mogoče najti." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Domov" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Napaka na strežniku" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Napaka na strežniku (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Napaka na strežniku (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -379,120 +368,141 @@ "Prišlo je do nepričakovane napake. Napaka je bila javljena administratorjem " "spletne strani in naj bi jo v kratkem odpravili. Hvala za potrpljenje." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Izvedi izbrano dejanje" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Pojdi" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Kliknite tu za izbiro vseh vnosov na vseh straneh" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Izberi vse %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Počisti izbiro" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Najprej vpišite uporabniško ime in geslo, nato boste lahko urejali druge " +"lastnosti uporabnika." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Vnesite uporabniško ime in geslo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Spremeni geslo" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Prosimo, odpravite sledeče napake." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Prosimo popravite spodnje napake." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Vpišite novo geslo za uporabnika %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Geslo" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Geslo (ponovno)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Vpišite enako geslo kot zgoraj, da se izognete tipkarskim napakam." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Dobrodošli," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentacija" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Spremeni geslo" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Odjava" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administrativni vmesnik" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administracija" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Dodaj" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Zgodovina" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Poglej na strani" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Prosimo, odpravite sledeče napake." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Prosimo popravite spodnje napake." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Dodaj %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Odstrani iz razvrščanja" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioriteta razvrščanja: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Preklopi razvrščanje" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Izbriši" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -502,7 +512,7 @@ "Izbris %(object_name)s '%(escaped_object)s' bi pomenil izbris povezanih " "objektov, vendar nimate dovoljenja za izbris naslednjih tipov objektov:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -511,7 +521,7 @@ "Brisanje %(object_name)s '%(escaped_object)s' bi zahtevalo brisanje " "naslednjih zaščitenih povezanih objektov:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -520,16 +530,16 @@ "Ste prepričani, da želite izbrisati %(object_name)s \"%(escaped_object)s\"? " "Vsi naslednji povezani elementi bodo izbrisani:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, prepričan sem" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Izbriši več objektov" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -540,7 +550,7 @@ "povezanih objektov, vendar vaš račun nima pravic za izbris naslednjih tipov " "objektov:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -549,7 +559,7 @@ "Brisanje izbranih %(objects_name)s zahteva brisanje naslednjih zaščitenih " "povezanih objektov:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -558,41 +568,56 @@ "Ali res želite izbrisati izbrane %(objects_name)s? Vsi naslednji objekti in " "njihovi povezani vnosi bodo izbrisani:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Odstrani" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Dodaj še en %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Izbrišem?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Po %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Model v %(name)s aplikaciji" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Spremeni" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nimate dovoljenja za urejanje." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Zadnja dejanja" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Moja dejanja" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Ni na voljo" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Neznana vsebina" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -602,27 +627,27 @@ "ustvarjene prave tabele v podatkovni bazi in da je dostop do branja baze " "omogočen pravemu uporabniku." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Geslo:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Ste pozabili geslo ali uporabniško ime?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/čas" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Uporabnik" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Dejanje" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -630,19 +655,20 @@ "Ta objekt nima zgodovine sprememb. Verjetno ni bil dodan preko te strani za " "administracijo." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Prikaži vse" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Shrani" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Išči" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -651,93 +677,41 @@ msgstr[2] "%(counter)s zadetka" msgstr[3] "%(counter)s zadetki" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s skupno" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Shrani kot novo" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Shrani in dodaj še eno" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Shrani in nadaljuj z urejanjem" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Najprej vpišite uporabniško ime in geslo, nato boste lahko urejali druge " -"lastnosti uporabnika." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Vnesite uporabniško ime in geslo." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Vpišite novo geslo za uporabnika %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Geslo" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Geslo (ponovno)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Vpišite enako geslo kot zgoraj, da se izognete tipkarskim napakam." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Odstrani" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Dodaj še en %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Izbrišem?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Hvala, ker ste si danes vzeli nekaj časa za to spletno stran." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Ponovna prijava" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Sprememba gesla" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Sprememba gesla je uspela" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Vaše geslo je bilo spremenjeno." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -745,64 +719,48 @@ "Vnesite vaše staro geslo (zaradi varnosti) in nato še dvakrat novo, da se " "izognete tipkarskim napakam." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Staro geslo" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Novo geslo" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Spremeni moje geslo" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Ponastavitev gesla" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Ponastavitev gesla zaključena" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Vaše geslo je bilo nastavljeno. Zdaj se lahko prijavite." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potrdite ponastavitev gesla" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Vpišite novo geslo" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Vnesite vaše novo geslo dvakrat, da se izognete tipkarskim napakam." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Novo geslo:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potrditev gesla:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Ponastavitev gesla ni uspela" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -810,12 +768,7 @@ "Povezava za ponastavitev gesla ni bila veljavna, morda je bila že " "uporabljena. Prosimo zahtevajte novo ponastavitev gesla." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Ponastavitev gesla je uspela" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -823,7 +776,7 @@ "Na e-poštni naslov, ki ste ga navedli, smo vam poslali navodila za " "nastavitev gesla. Pošto bi morali prejeti v kratkem." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -831,7 +784,7 @@ "Če e-pošte niste prejeli, prosimo preverite, da ste vnesli pravilen e-poštni " "naslov in preverite nezaželeno pošto." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -840,24 +793,24 @@ "To e-pošto ste prejeli, ker je ste zahtevali ponastavitev gesla za vaš " "uporabniški račun na %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Prosimo pojdite na sledečo stran in izberite novo geslo:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Vaše uporabniško ime (za vsak primer):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Hvala, ker uporabljate našo stran!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Ekipa strani %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -865,28 +818,52 @@ "Ste pozabili geslo? Vnesite vaš e-poštni naslov in poslali vam bomo navodila " "za ponastavitev gesla." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-poštni naslov:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Ponastavi moje geslo" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Vsi datumi" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(None)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Izberite %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Izberite %s, ki ga želite spremeniti" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Ura:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Poizvedba" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Dodaj še enega" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Trenutno:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Spremembe:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sq/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # Besnik , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/" "sq/)\n" "MIME-Version: 1.0\n" @@ -17,12 +17,12 @@ "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "I mundshëm %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "kutiza më poshtë e mandej duke klikuar mbi shigjetën \"Zgjidhe\" mes dy " "kutizave." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Shkruani brenda kutizës që të filtrohet lista e %s të passhme." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filtro" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Zgjidheni krejt" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klikoni që të zgjidhen krejt %s njëherësh." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Zgjidhni" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Hiq" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "U zgjodh %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "kutiza më poshtë e mandej duke klikuar mbi shigjetën \"Hiqe\" mes dy " "kutizave." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Hiqi krejt" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klikoni që të hiqen krejt %s e zgjedhura njëherësh." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "U përzgjodh %(sel)s nga %(cnt)s" msgstr[1] "U përzgjodhën %(sel)s nga %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "Keni ndryshime të paruajtura te fusha individuale të ndryshueshme. Nëse " "kryeni një veprim, ndryshimet e paruajtura do të humbin." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +109,8 @@ "fusha individuale. Ju lutem, klikoni OK që të bëhet ruajtja. Do t'ju duhet " "ta ribëni veprimin." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -116,69 +120,85 @@ "individuale. Ndoshta po kërkonit për butonin Shko, në vend se të butonit " "Ruaje." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Janar Shkurt Mars Prill Maj Qershor Korrik Gusht Shtator Tetor Nëntor Dhjetor" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "D H M M E P S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Shfaqe" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Fshihe" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Tani" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Orë" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Zgjidhni një kohë" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Mesnatë" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m." -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Mesditë" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Anuloje" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Sot" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendar" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Dje" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Nesër" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Janar Shkurt Mars Prill Maj Qershor Korrik Gusht Shtator Tetor Nëntor Dhjetor" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "D H M M E P S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Shfaqe" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Fshihe" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sq/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sq/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sq/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sq/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sq/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,10 +4,10 @@ # Besnik , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Albanian (http://www.transifex.com/projects/p/django/language/" "sq/)\n" @@ -17,62 +17,68 @@ "Language: sq\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "U fshinë me sukses %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "S'mund të fshijë %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Jeni i sigurt?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Fshiji %(verbose_name_plural)s e përzgjdhur" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Krejt" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Po" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Jo" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "E panjohur" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Çfarëdo date" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Sot" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "7 ditët e shkuara" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Këtë muaj" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Këtë vit" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -82,101 +88,98 @@ "ekipi. Kini parasysh se që të dyja fushat mund të jenë të ndjeshme ndaj " "shkrimit me shkronja të mëdha ose të vogla." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Ju lutem, hyni sërish, sepse sesioni juaj ka skaduar." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Veprim:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "kohë veprimi" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id objekti" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "shenjë veprimi" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "mesazh ndryshimi" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "zë regjistrimi" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "zëra regjistrimi" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "U shtua \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "U ndryshua \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "U fshi \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Asnjë" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Ndryshoi %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr " dhe " -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "U shtua %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "U ndryshua %(list)s për %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "U fshi %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Nuk u ndryshuan fusha." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" u shtua me sukses. Mund ta përpunoni sërish më poshtë." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -185,12 +188,12 @@ "%(name)s \"%(obj)s\" u shtua me sukses. Mund të shtoni një tjetër %(name)s " "më poshtë." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" u shtua me sukses." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -198,7 +201,7 @@ msgstr "" "%(name)s \"%(obj)s\" u shtua me sukses. Mund ta përpunoni sërish më poshtë." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -207,12 +210,12 @@ "%(name)s \"%(obj)s\" u ndryshua me sukses. Mund të shtoni një tjetër " "%(name)s më poshtë." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" u ndryshua me sukses." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -220,66 +223,66 @@ "Duhen përzgjedhur objekte që të kryhen veprime mbi ta. Nuk u ndryshua ndonjë " "objekt." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Pa përzgjedhje veprimi." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Shtoni %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" u fshi me sukses." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekti %(name)s me kyç parësor %(key)r nuk ekziston." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Shtoni %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Ndrysho %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Gabimi baze të dhënash" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s u ndryshua me sukses." msgstr[1] "%(count)s %(name)s u ndryshuan me sukses." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s të përzgjedhur" msgstr[1] "Krejt %(total_count)s të përzgjedhurat" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 nga %(cnt)s të përzgjedhur" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" u fshi me sukses." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ndryshoni historikun: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -288,83 +291,71 @@ "Fshirja e %(class_name)s %(instance)s do të lypte fshirjen e objekteve " "vijuese të mbrojtura që kanë lidhje me ta: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Hyni" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Përgjegjësi i site-it Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Administrim i Django-s" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administrim site-i" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administrim i %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datë:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Kohë:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Kërkim" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Shtoni Një Tjetër" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Tani:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Hyni" -#: widgets.py:303 -msgid "Change:" -msgstr "Ndryshim:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Nuk u gjet faqe" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Na ndjeni, por faqja e kërkuar nuk gjendet dot." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Hyrje" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Gabim shërbyesi" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Gabim shërbyesi (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Gabim Shërbyesi (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -372,120 +363,142 @@ "Pati një gabim. Iu është njoftuar përgjegjësve të site-it përmes email-it " "dhe do të duhej të ndreqej shpejt. Faleminderit për durimin." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Xhironi veprimin e përzgjedhur" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Shko tek" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klikoni këtu që të përzgjidhni objektet nëpër krejt faqet" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Përzgjidhni krejt %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Pastroje përzgjedhjen" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Së pari, jepni një emër përdoruesi dhe fjalëkalim. Mandej, do të jeni në " +"gjendje të përpunoni më tepër mundësi përdoruesi." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Jepni emër përdoruesi dhe fjalëkalim." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Ndryshoni fjalëkalimin" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Ju lutem, ndreqini gabimet e mëposhtme." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" +"Jepni një fjalëkalim të ri për përdoruesin %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Fjalëkalim" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Fjalëkalim (sërish)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Jepni, për verifikim, të njëjtin fjalëkalim si më sipër." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Mirë se vini," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentim" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Ndryshoni fjalëkalimin" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Dilni" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Përgjegjësi i site-it Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Administrim i Django-s" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Shtoni" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historik" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Shiheni në site" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Ju lutem, ndreqini gabimet e mëposhtme." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Shto %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtër" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Hiqe prej renditjeje" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Përparësi renditjesh: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Këmbe renditjen" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Fshije" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -496,7 +509,7 @@ "objekteve të lidhur me të, por llogaria juaj nuk ka leje për fshirje të " "objekteve të llojeve të mëposhtëm:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -505,7 +518,7 @@ "Fshirja e %(object_name)s '%(escaped_object)s' do të kërkonte fshirjen e " "objekteve vijues, të mbrojtur, të lidhur me të:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -514,16 +527,16 @@ "Jeni i sigurt se doni të fshihet %(object_name)s \"%(escaped_object)s\"? " "Krejt objektet vijues të lidhur me të do të fshihen:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Po, jam i sigurt" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Fshini disa objekte njëherësh" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -534,7 +547,7 @@ "objekteve të lidhur me të, por llogaria juaj nuk ka leje të fshijë llojet " "vijuese të objekteve:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -543,7 +556,7 @@ "Fshirja e %(objects_name)s të përzgjedhur do të kërkonte fshirjen e " "objekteve vijues, të mbrojtur, të lidhur me të:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -552,41 +565,56 @@ "Jeni i sigurt se doni të fshihen e %(objects_name)s përzgjedhur? Krejt " "objektet vijues dhe gjëra të lidhura me ta do të fshihen:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Hiqe" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Shtoni një tjetër %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Të fshihet?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Nga %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modele te zbatimi %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Ndryshoje" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nuk keni leje për të përpunuar ndonjë gjë." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Veprime Së Fundi" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Veprimet e Mia" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Asnjë i passhëm" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Lëndë e panjohur" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -596,27 +624,27 @@ "që janë krijuar tabelat e duhura të bazës së të dhënave, dhe që baza e të " "dhënave është e lexueshme nga përdoruesi i duhur." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Fjalëkalim:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Harruat fjalëkalimin ose emrin tuaj të përdoruesit?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datë/kohë" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Përdorues" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Veprim" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -624,113 +652,61 @@ "Ky objekt nuk ka historik ndryshimesh. Ndoshta nuk qe shtuar përmes këtij " "site-i administrimi." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Shfaqi krejt" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Ruaje" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Kërko" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s përfundim" msgstr[1] "%(counter)s përfundime" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s gjithsej" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Ruaje si të ri" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Ruajeni dhe shtoni një tjetër" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Ruajeni dhe vazhdoni përpunimin" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Së pari, jepni një emër përdoruesi dhe fjalëkalim. Mandej, do të jeni në " -"gjendje të përpunoni më tepër mundësi përdoruesi." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Jepni emër përdoruesi dhe fjalëkalim." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" -"Jepni një fjalëkalim të ri për përdoruesin %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Fjalëkalim" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Fjalëkalim (sërish)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Jepni, për verifikim, të njëjtin fjalëkalim si më sipër." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Hiqe" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Shtoni një tjetër %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Të fshihet?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Faleminderit që shpenzoni pak kohë të çmuar me site-in Web sot." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Hyni sërish" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Ndryshim fjalëkalimi" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Ndryshim i sukseshëm fjalëkalimi" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Fjalëkalimi juaj u ndryshua." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -739,47 +715,35 @@ "jepni dy herë fjalëkalimin tuaj të ri, që kështu të mund të verifikojmë se e " "shtypët saktë." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Fjalëkalim i vjetër" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Fjalëkalim i ri" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Ndrysho fjalëkalimin tim" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Ricaktim fjalëkalimi" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Ricaktim fjalëkalimi i plotësuar" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "Fjakalimi juaj u caktua. Mund të vazhdoni më tej dhe të bëni hyrjen tani." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Ripohim ricaktimi fjalëkalimi" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Jepni fjalëkalim të ri" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -787,19 +751,15 @@ "Ju lutem, jepeni fjalëkalimin tuaj dy herë, që kështu të mund të verifikojmë " "që e shtypët saktë." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Fjalëkalim i ri:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Ripohoni fjalëkalimin:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Fjalëkalimi nuk u ricaktua me sukses" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,12 +767,7 @@ "Lidhja për ricaktimin e fjalëkalimit qe e pavlefshme, ndoshta ngaqë është " "përdorur tashmë një herë. Ju lutem, kërkoni një ricaktim të ri fjalëkalimi." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Ndryshim i sukseshëm fjalëkalimi" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -820,7 +775,7 @@ "Ju kemi dërguar me email udhëzime për caktimin e fjalëkalimit tuaj. Do të " "duhej t'ju vinin pas pak." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -829,7 +784,7 @@ "saktë me të cilën u regjistruat, dhe kontrolloni dosjen tuaj të mesazheve " "hedhurinë." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -838,24 +793,24 @@ "Këtë email po e merrni ngaqë kërkuat ricaktim fjalëkalimi për llogarinë tuaj " "si përdorues te %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Ju lutem, shkoni te faqja vijuese dhe zgjidhni një fjalëkalim të ri:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Emri juaj i përdoruesit, në rast se e keni harruar:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Faleminderit që përdorni site-in tonë!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Ekipi i %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -863,28 +818,52 @@ "Harruat fjalëkalimin tuaj? Jepni më poshtë adresën tuaj email, dhe do t'ju " "dërgojmë udhëzimet për të caktuar një të ri." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Adresë email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Ricakto fjalëkalimin tim" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Krejt datat" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Asnjë)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Përzgjidhni %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Përzgjidhni %s për ta ndryshuar" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datë:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Kohë:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Kërkim" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Shtoni Një Tjetër" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Tani:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ndryshim:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sr/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # Janos Guljas , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/" "sr/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Доступни %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "Ово је листа доступних „%s“. Можете изабрати елементе тако што ћете их " "изабрати у листи и кликнути на „Изабери“." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Филтрирајте листу доступних елемената „%s“." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Филтер" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Изабери све" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Изаберите све „%s“ одједном." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Изабери" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Уклони" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Изабрано „%s“" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,107 +73,129 @@ "Ово је листа изабраних „%s“. Можете уклонити елементе тако што ћете их " "изабрати у листи и кликнути на „Уклони“." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Уклони све" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Уклоните све изабране „%s“ одједном." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s од %(cnt)s изабран" msgstr[1] "%(sel)s од %(cnt)s изабрана" msgstr[2] "%(sel)s од %(cnt)s изабраних" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" "Имате несачиване измене. Ако покренете акцију, измене ће бити изгубљене." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "Изабрали сте акцију али нисте сачували промене поља." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "Изабрали сте акцију али нисте изменили ни једно поље." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"јануар фебруар март април мај јун јул август септембар октобар новембар " -"децембар" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Н П У С Ч П С" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Покажи" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Сакриј" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Тренутно време" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Сат" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Одабир времена" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Поноћ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "18ч" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Подне" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Поништи" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Данас" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Календар" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Јуче" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Сутра" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"јануар фебруар март април мај јун јул август септембар октобар новембар " +"децембар" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Н П У С Ч П С" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Покажи" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Сакриј" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sr/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sr/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sr/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,10 @@ # Janos Guljas , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Serbian (http://www.transifex.com/projects/p/django/language/" "sr/)\n" @@ -19,156 +19,159 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успешно обрисано: %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Несуспело брисање %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Да ли сте сигурни?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Бриши означене објекте класе %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Сви" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Да" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Не" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Непознато" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Сви датуми" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Данас" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Последњих 7 дана" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Овај месец" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ова година" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Пријавите се поново пошто је ваша сесија истекла." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Радња:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "време радње" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id објекта" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "опис објекта" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "ознака радње" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "опис измене" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "запис у логовима" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "записи у логовима" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Додат објекат класе „%(object)s“." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Промењен објекат класе „%(object)s“ - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Уклоњен објекат класе „%(object)s“." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Објекат уноса лога" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ништа" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Измењена поља %s" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "и" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Сачуван објекат „%(object)s“ класе %(name)s." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Измењена поља %(list)s објеката „%(object)s“ класе %(name)s ." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Обрисан објекат „%(object)s“ класе %(name)s." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Без измена у пољима." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,38 +179,38 @@ "Објекат „%(obj)s“ класе %(name)s додат је успешно. Доле можете унети додатне " "измене." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Објекат „%(obj)s“ класе %(name)s сачуван је успешно." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Објекат „%(obj)s“ класе %(name)s измењен је успешно." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -215,30 +218,35 @@ "Потребно је изабрати објекте да би се извршила акција над њима. Ниједан " "објекат није промењен." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Није изабрана ниједна акција." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Додај објекат класе %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Објекат „%(obj)s“ класе %(name)s успешно је обрисан." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Објекат класе %(name)s са примарним кључем %(key)r не постоји." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Додај објекат класе %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Измени објекат класе %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Грешка у бази података" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -246,7 +254,7 @@ msgstr[1] "Успешно промењена %(count)s %(name)s." msgstr[2] "Успешно промењених %(count)s %(name)s." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -254,231 +262,235 @@ msgstr[1] "Сва %(total_count)s изабрана" msgstr[2] "Свих %(total_count)s изабраних" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 од %(cnt)s изабрано" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Објекат „%(obj)s“ класе %(name)s успешно је обрисан." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Историјат измена: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Пријава" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django администрација сајта" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django администрација" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Администрација система" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Администрација %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Датум:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Време:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Претражи" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Додај још један" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Пријава" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Страница није пронађена" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Жао нам је, тражена страница није пронађена." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Почетна" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Грешка на серверу" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Грешка на серверу (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Грешка на серверу (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Покрени одабрану радњу" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Почни" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Изабери све објекте на овој страници." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Изабери све %(module_name)s од %(total_count)s укупно." -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Поништи избор" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Прво унесите корисничко име и лозинку. Потом ћете моћи да мењате још " +"корисничких подешавања." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Унесите корисничко име и лозинку" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Промена лозинке" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Исправите наведене грешке." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Унесите нову лозинку за корисника %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Лозинка" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Лозинка (поновите)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Добродошли," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документација" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Промена лозинке" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Одјава" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django администрација сајта" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django администрација" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Додај" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Историјат" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Преглед на сајту" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Исправите наведене грешке." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Додај објекат класе %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Филтер" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Избаци из сортирања" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Приоритет сортирања: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Укључи/искључи сортирање" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Обриши" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -489,7 +501,7 @@ "који су повезани са овим објектом, али ваш налог нема дозволе за брисање " "следећих типова објеката:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -498,7 +510,7 @@ "Да би избрисали изабран %(object_name)s „%(escaped_object)s“ потребно је " "брисати и следеће заштићене повезане објекте:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -507,16 +519,16 @@ "Да сигурни да желите да обришете %(object_name)s „%(escaped_object)s“? " "Следећи објекти који су у вези са овим објектом ће такође бити обрисани:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Да, сигуран сам" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Брисање више објеката" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -527,7 +539,7 @@ "повезане објекте, међутим ваш налог нема дозволе за брисање следећих типова " "објеката:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -536,7 +548,7 @@ "Да би избрисали изабране %(objects_name)s потребно је брисати и следеће " "заштићене повезане објекте:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -545,41 +557,56 @@ "Да ли сте сигурни да желите да избришете изабране %(objects_name)s? Сви " "следећи објекти и објекти са њима повезани ће бити избрисани:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Обриши" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Додај још један објекат класе %(verbose_name)s." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Брисање?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Измени" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Немате дозволе да уносите било какве измене." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Последње радње" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Моје радње" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Нема података" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Непознат садржај" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -588,27 +615,27 @@ "Нешто није уреду са вашом базом података. Проверите да ли постоје " "одговарајуће табеле и да ли одговарајући корисник има приступ бази." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Лозинка:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Заборавили сте лозинку или корисничко име?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Датум/време" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Корисник" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Радња" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -616,19 +643,20 @@ "Овај објекат нема забележен историјат измена. Вероватно није додат кроз овај " "сајт за администрацију." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Прикажи све" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Сачувај" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Претрага" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -636,93 +664,41 @@ msgstr[1] "%(counter)s резултата" msgstr[2] "%(counter)s резултата" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "укупно %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Сачувај као нови" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Сачувај и додај следећи" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Сачувај и настави са изменама" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Прво унесите корисничко име и лозинку. Потом ћете моћи да мењате још " -"корисничких подешавања." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Унесите корисничко име и лозинку" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Унесите нову лозинку за корисника %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Лозинка" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Лозинка (поновите)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Ради провере тачности поново унесите лозинку коју сте унели горе." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Обриши" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Додај још један објекат класе %(verbose_name)s." - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Брисање?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Хвала што сте данас провели време на овом сајту." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Поновна пријава" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Измена лозинке" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Успешна измена лозинке" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ваша лозинка је измењена." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -730,46 +706,34 @@ "Из безбедносних разлога прво унесите своју стару лозинку, а нову затим " "унесите два пута да бисмо могли да проверимо да ли сте је правилно унели." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Стара лозинка" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Нова лозинка" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Измени моју лозинку" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Ресетовање лозинке" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Ресетовање лозинке успешно" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Ваша лозинка је постављена. Можете се пријавити." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Потврда ресетовања лозинке" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Унесите нову лозинку" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -777,19 +741,15 @@ "Унесите нову лозинку два пута како бисмо могли да проверимо да ли сте је " "правилно унели." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Нова лозинка:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Потврда лозинке:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Ресетовање лозинке неуспешно" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -797,75 +757,94 @@ "Линк за ресетовање лозинке није важећи, вероватно зато што је већ " "искоришћен. Поново затражите ресетовање лозинке." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Ресетовање лозинке успешно." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Идите на следећу страницу и поставите нову лозинку." -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Уколико сте заборавили, ваше корисничко име:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Хвала што користите наш сајт!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Екипа сајта %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Ресетуј моју лозинку" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Сви датуми" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ништа)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Одабери објекат класе %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Одабери објекат класе %s за измену" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Датум:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Време:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Претражи" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Додај још један" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,11 +5,11 @@ # Janos Guljas , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/" "language/sr@latin/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Dostupni %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "Ovo je lista dostupnih „%s“. Možete izabrati elemente tako što ćete ih " "izabrati u listi i kliknuti na „Izaberi“." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Filtrirajte listu dostupnih elemenata „%s“." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Izaberi sve" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Izaberite sve „%s“ odjednom." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Izaberi" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Ukloni" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Izabrano „%s“" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,107 +73,129 @@ "Ovo je lista izabranih „%s“. Možete ukloniti elemente tako što ćete ih " "izabrati u listi i kliknuti na „Ukloni“." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Ukloni sve" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Uklonite sve izabrane „%s“ odjednom." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s od %(cnt)s izabran" msgstr[1] "%(sel)s od %(cnt)s izabrana" msgstr[2] "%(sel)s od %(cnt)s izabranih" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" "Imate nesačivane izmene. Ako pokrenete akciju, izmene će biti izgubljene." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "Izabrali ste akciju ali niste sačuvali promene polja." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "Izabrali ste akciju ali niste izmenili ni jedno polje." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"januar februar mart april maj jun jul avgust septembar oktobar novembar " -"decembar" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "N P U S Č P S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Pokaži" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Sakrij" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" +msgstr[2] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Trenutno vreme" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Sat" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Odabir vremena" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Ponoć" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "18č" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Podne" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Poništi" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Danas" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalendar" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Juče" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Sutra" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"januar februar mart april maj jun jul avgust septembar oktobar novembar " +"decembar" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "N P U S Č P S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Pokaži" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Sakrij" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sr_Latn/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -5,10 +5,10 @@ # Janos Guljas , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/django/" "language/sr@latin/)\n" @@ -19,156 +19,159 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Uspešno obrisano: %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Nesuspelo brisanje %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Da li ste sigurni?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Briši označene objekte klase %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Svi" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Da" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ne" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Nepoznato" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Svi datumi" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Danas" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Poslednjih 7 dana" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Ovaj mesec" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Ova godina" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Prijavite se ponovo pošto je vaša sesija istekla." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Radnja:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "vreme radnje" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id objekta" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "opis objekta" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "oznaka radnje" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "opis izmene" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "zapis u logovima" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "zapisi u logovima" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Dodat objekat klase „%(object)s“." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Promenjen objekat klase „%(object)s“ - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Uklonjen objekat klase „%(object)s“." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Objekat unosa loga" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ništa" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Izmenjena polja %s" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "i" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Sačuvan objekat „%(object)s“ klase %(name)s." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Izmenjena polja %(list)s objekata „%(object)s“ klase %(name)s ." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Obrisan objekat „%(object)s“ klase %(name)s." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Bez izmena u poljima." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,38 +179,38 @@ "Objekat „%(obj)s“ klase %(name)s dodat je uspešno. Dole možete uneti dodatne " "izmene." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Objekat „%(obj)s“ klase %(name)s sačuvan je uspešno." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Objekat „%(obj)s“ klase %(name)s izmenjen je uspešno." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -215,30 +218,35 @@ "Potrebno je izabrati objekte da bi se izvršila akcija nad njima. Nijedan " "objekat nije promenjen." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Nije izabrana nijedna akcija." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Dodaj objekat klase %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Objekat „%(obj)s“ klase %(name)s uspešno je obrisan." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Objekat klase %(name)s sa primarnim ključem %(key)r ne postoji." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Dodaj objekat klase %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Izmeni objekat klase %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Greška u bazi podataka" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -246,7 +254,7 @@ msgstr[1] "Uspešno promenjena %(count)s %(name)s." msgstr[2] "Uspešno promenjenih %(count)s %(name)s." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -254,231 +262,235 @@ msgstr[1] "Sva %(total_count)s izabrana" msgstr[2] "Svih %(total_count)s izabranih" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 od %(cnt)s izabrano" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Objekat „%(obj)s“ klase %(name)s uspešno je obrisan." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Istorijat izmena: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Prijava" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django administracija sajta" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django administracija" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Administracija sistema" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administracija %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Vreme:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Pretraži" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Dodaj još jedan" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Prijava" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Stranica nije pronađena" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Žao nam je, tražena stranica nije pronađena." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Početna" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Greška na serveru" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Greška na serveru (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Greška na serveru (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Pokreni odabranu radnju" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Počni" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Izaberi sve objekte na ovoj stranici." -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Izaberi sve %(module_name)s od %(total_count)s ukupno." -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Poništi izbor" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Prvo unesite korisničko ime i lozinku. Potom ćete moći da menjate još " +"korisničkih podešavanja." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Unesite korisničko ime i lozinku" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Promena lozinke" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Ispravite navedene greške." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Unesite novu lozinku za korisnika %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Lozinka" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Lozinka (ponovite)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Dobrodošli," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentacija" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Promena lozinke" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Odjava" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django administracija sajta" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django administracija" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Dodaj" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Istorijat" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Pregled na sajtu" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Ispravite navedene greške." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Dodaj objekat klase %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filter" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Izbaci iz sortiranja" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Prioritet sortiranja: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Uključi/isključi sortiranje" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Obriši" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -489,7 +501,7 @@ "objekata koji su povezani sa ovim objektom, ali vaš nalog nema dozvole za " "brisanje sledećih tipova objekata:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -498,7 +510,7 @@ "Da bi izbrisali izabran %(object_name)s „%(escaped_object)s“ potrebno je " "brisati i sledeće zaštićene povezane objekte:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -507,16 +519,16 @@ "Da sigurni da želite da obrišete %(object_name)s „%(escaped_object)s“? " "Sledeći objekti koji su u vezi sa ovim objektom će takođe biti obrisani:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Da, siguran sam" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Brisanje više objekata" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -527,7 +539,7 @@ "povezane objekte, međutim vaš nalog nema dozvole za brisanje sledećih tipova " "objekata:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -536,7 +548,7 @@ "Da bi izbrisali izabrane %(objects_name)s potrebno je brisati i sledeće " "zaštićene povezane objekte:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -545,41 +557,56 @@ "Da li ste sigurni da želite da izbrišete izabrane %(objects_name)s? Svi " "sledeći objekti i objekti sa njima povezani će biti izbrisani:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Obriši" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Dodaj još jedan objekat klase %(verbose_name)s." + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Brisanje?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Izmeni" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Nemate dozvole da unosite bilo kakve izmene." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Poslednje radnje" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Moje radnje" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Nema podataka" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Nepoznat sadržaj" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -588,27 +615,27 @@ "Nešto nije uredu sa vašom bazom podataka. Proverite da li postoje " "odgovarajuće tabele i da li odgovarajući korisnik ima pristup bazi." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Lozinka:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Zaboravili ste lozinku ili korisničko ime?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum/vreme" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Korisnik" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Radnja" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -616,19 +643,20 @@ "Ovaj objekat nema zabeležen istorijat izmena. Verovatno nije dodat kroz ovaj " "sajt za administraciju." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Prikaži sve" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Sačuvaj" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Pretraga" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -636,93 +664,41 @@ msgstr[1] "%(counter)s rezultata" msgstr[2] "%(counter)s rezultata" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "ukupno %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Sačuvaj kao novi" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Sačuvaj i dodaj sledeći" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Sačuvaj i nastavi sa izmenama" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Prvo unesite korisničko ime i lozinku. Potom ćete moći da menjate još " -"korisničkih podešavanja." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Unesite korisničko ime i lozinku" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Unesite novu lozinku za korisnika %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Lozinka" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Lozinka (ponovite)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Radi provere tačnosti ponovo unesite lozinku koju ste uneli gore." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Obriši" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Dodaj još jedan objekat klase %(verbose_name)s." - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Brisanje?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Hvala što ste danas proveli vreme na ovom sajtu." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Ponovna prijava" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Izmena lozinke" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Uspešna izmena lozinke" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Vaša lozinka je izmenjena." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -730,46 +706,34 @@ "Iz bezbednosnih razloga prvo unesite svoju staru lozinku, a novu zatim " "unesite dva puta da bismo mogli da proverimo da li ste je pravilno uneli." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Stara lozinka" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nova lozinka" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Izmeni moju lozinku" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Resetovanje lozinke" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Resetovanje lozinke uspešno" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Vaša lozinka je postavljena. Možete se prijaviti." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Potvrda resetovanja lozinke" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Unesite novu lozinku" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -777,19 +741,15 @@ "Unesite novu lozinku dva puta kako bismo mogli da proverimo da li ste je " "pravilno uneli." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nova lozinka:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Potvrda lozinke:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Resetovanje lozinke neuspešno" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -797,75 +757,94 @@ "Link za resetovanje lozinke nije važeći, verovatno zato što je već " "iskorišćen. Ponovo zatražite resetovanje lozinke." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Resetovanje lozinke uspešno." - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Idite na sledeću stranicu i postavite novu lozinku." -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Ukoliko ste zaboravili, vaše korisničko ime:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Hvala što koristite naš sajt!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Ekipa sajta %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Resetuj moju lozinku" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Svi datumi" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ništa)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Odaberi objekat klase %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Odaberi objekat klase %s za izmenu" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Vreme:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Pretraži" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Dodaj još jedan" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sv/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -7,11 +7,11 @@ # Samuel Linde , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -20,12 +20,12 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Tillgängliga %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -35,38 +35,38 @@ "dem i rutan nedan och sedan klicka på \"Välj\"-knapparna mellan de två " "rutorna." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Skriv i denna ruta för att filtrera listan av tillgängliga %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Filter" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Välj alla" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Klicka för att välja alla %s på en gång." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Välj" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Ta bort" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Välj %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,22 +75,24 @@ "Detta är listan med utvalda %s. Du kan ta bort vissa genom att markera dem i " "rutan nedan och sedan klicka på \"Ta bort\"-pilen mellan de två rutorna." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Ta bort alla" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Klicka för att ta bort alla valda %s på en gång." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s av %(cnt)s markerade" msgstr[1] "%(sel)s av %(cnt)s markerade" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -98,7 +100,8 @@ "Du har ändringar som inte sparats i enskilda redigerbara fält. Om du kör en " "operation kommer de ändringar som inte sparats att gå förlorade." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +111,8 @@ "till enskilda fält ännu. Var vänlig klicka OK för att spara. Du kommer att " "behöva köra operationen på nytt." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +121,86 @@ "Du har markerat en operation och du har inte gjort några ändringar i " "enskilda fält. Du letar antagligen efter Utför-knappen snarare än Spara." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januari Februari Mars April Maj Juni Juli Augusti September Oktober November " -"December" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T O T F L" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Visa" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Göm" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Nu" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Klocka" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Välj en tidpunkt" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Midnatt" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "06:00" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Middag" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Avbryt" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "I dag" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalender" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "I går" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "I morgon" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januari Februari Mars April Maj Juni Juli Augusti September Oktober November " +"December" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T O T F L" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Visa" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Göm" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sv/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sv/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sv/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sv/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sv/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,19 +1,20 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Alex Nordlund , 2012 +# Alexander Nordlund , 2012 +# Andreas Pelme , 2014 # cvitan , 2011 # Cybjit , 2012 # Jannis Leidel , 2011 # sorl , 2011 -# biljettshop , 2013 +# Thomas Lundqvist , 2013 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-10-28 10:03+0000\n" -"Last-Translator: biljettshop \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-29 14:03+0000\n" +"Last-Translator: Andreas Pelme \n" "Language-Team: Swedish (http://www.transifex.com/projects/p/django/language/" "sv/)\n" "MIME-Version: 1.0\n" @@ -22,62 +23,68 @@ "Language: sv\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Tog bort %(count)d %(items)s" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Kan inte ta bort %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Är du säker?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Tag bort markerade %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Administration" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Alla" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ja" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Nej" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Okänt" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Alla datum" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Idag" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Senaste 7 dagarna" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Denna månad" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Detta år" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -86,101 +93,98 @@ "Ange %(username)s och lösenord för ett personalkonto. Notera att båda fälten " "är skiftlägeskänsliga." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Var god logga in igen, eftersom din session har förfallit." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Åtgärd:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "händelsetid" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "objektets id" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "objektets beskrivning" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "händelseflagga" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "ändra meddelande" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "loggpost" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "loggposter" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Lade till \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Ändrade \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Tog bort \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry-Objekt" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Inget" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Ändrade %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "och" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Lade till %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Ändrade %(list)s på %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Tog bort %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Inga fält ändrade." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" lades till. Du kan redigera objektet igen nedanför." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,19 +193,19 @@ "%(name)s \"%(obj)s\" lades till. Du kan lägga till ytterligare %(name)s " "nedan." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" lades till." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "%(name)s \"%(obj)s\" ändrades. Du kan ändra det igen nedan." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -210,78 +214,78 @@ "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" ändrades." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Poster måste väljas för att genomföra åtgärder. Inga poster har ändrats." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Inga åtgärder valda." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Lägg till %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" togs bort." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s-objekt med primärnyckel %(key)r finns inte." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Lägg till %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Ändra %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Databasfel" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s ändrades." msgstr[1] "%(count)s %(name)s ändrades." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s vald" msgstr[1] "Alla %(total_count)s valda" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 av %(cnt)s valda" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" togs bort." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Ändringshistorik: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -290,83 +294,71 @@ "Borttagning av %(class_name)s %(instance)s kräver borttagning av följande " "skyddade relaterade objekt: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Logga in" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django webbplatsadministration" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django-administration" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Webbplatsadministration" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Administration av %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Datum:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Tid:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Uppslag" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Lägg till ytterligare" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Nuvarande:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Logga in" -#: widgets.py:303 -msgid "Change:" -msgstr "Ändra:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Sidan kunde inte hittas" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Vi beklagar men den begärda sidan hittades inte." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Hem" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Serverfel" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Serverfel (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Serverfel (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -375,120 +367,141 @@ "webbplatsadministratörerna via e-post och bör bli rättat omgående. Tack för " "ditt tålamod." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Kör markerade operationer" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Utför" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Klicka här för att välja alla objekt från alla sidor" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Välj alla %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Rensa urval" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Ange först ett användarnamn och ett lösenord. Efter det kommer du att få " +"fler användaralternativ." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Mata in användarnamn och lösenord." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Ändra lösenord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Rätta till felen nedan." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Vänligen rätta till felen nedan." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Ange nytt lösenord för användare %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Lösenord" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Lösenord (igen)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Fyll i samma lösenord som ovan för verifiering." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Välkommen," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Dokumentation" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Ändra lösenord" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Logga ut" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django webbplatsadministration" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django-administration" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Lägg till" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historik" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Visa på webbplats" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Rätta till felen nedan." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Vänligen rätta till felen nedan." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Lägg till %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Filtrera" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Ta bort från sortering" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sorteringsprioritet: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Ändra sorteringsordning" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Radera" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -499,7 +512,7 @@ "relaterade objekt togs bort, men ditt konto har inte rättigheter att ta bort " "följande objekttyper:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -508,7 +521,7 @@ "Borttagning av %(object_name)s '%(escaped_object)s' kräver borttagning av " "följande skyddade relaterade objekt:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -517,16 +530,16 @@ "Är du säker på att du vill ta bort %(object_name)s \"%(escaped_object)s\"? " "Följande relaterade objekt kommer att tas bort:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ja, jag är säker" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Tog bort %(name)s \"%(object)s\"." -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -537,7 +550,7 @@ "relaterade objekt, men ditt konto har inte behörighet att ta bort följande " "typer av objekt:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -546,7 +559,7 @@ "Borttagning av valda %(objects_name)s skulle kräva borttagning av följande " "skyddade objekt:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -555,41 +568,56 @@ "Är du säker på att du vill ta bort valda %(objects_name)s? Alla följande " "objekt samt relaterade objekt kommer att tas bort: " -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Tag bort" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Lägg till ytterligare %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Radera?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " På %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Modeller i applikationen %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Ändra" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Du har inte rättigheter att redigera något." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Senaste Händelser" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Mina händelser" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Inga tillgängliga" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Okänt innehåll" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +626,27 @@ "Någonting är fel med din databasinstallation. Se till att de rätta " "databastabellerna har skapats och att databasen är läsbar av rätt användare." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Lösenord:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Har du glömt lösenordet eller användarnamnet?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Datum tid" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Användare" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Händelse" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,112 +654,61 @@ "Detta objekt har ingen ändringshistorik. Det lades antagligen inte till via " "denna administrationssida." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Visa alla" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Spara" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Sök" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s resultat" msgstr[1] "%(counter)s resultat" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s totalt" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Spara som ny" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Spara och lägg till ny" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Spara och fortsätt redigera" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Ange först ett användarnamn och ett lösenord. Efter det kommer du att få " -"fler användaralternativ." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Mata in användarnamn och lösenord." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Ange nytt lösenord för användare %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Lösenord" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Lösenord (igen)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Fyll i samma lösenord som ovan för verifiering." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Tag bort" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Lägg till ytterligare %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Radera?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Tack för att du spenderade lite kvalitetstid med webbplatsen idag." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Logga in igen" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Ändra lösenord" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Lösenordet ändrades" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ditt lösenord har ändrats." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -739,46 +716,34 @@ "Var god fyll i ditt gamla lösenord för säkerhets skull och skriv sedan in " "ditt nya lösenord två gånger så vi kan kontrollera att du skrev det rätt." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Gammalt lösenord" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Nytt lösenord" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Ändra mitt lösenord" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Nollställ lösenord" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Nollställning av lösenord klar" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Ditt lösenord har ändrats. Du kan nu logga in." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Bekräftelse av lösenordsnollställning" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Fyll i lösenord" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -786,19 +751,15 @@ "Var god fyll i ditt nya lösenord två gånger så vi kan kontrollera att du " "skrev det rätt." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Nytt lösenord:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Bekräfta lösenord:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Lösenordsnollställning misslyckad" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -806,12 +767,7 @@ "Länken för lösenordsnollställning var felaktig, möjligen därför att den " "redan använts. Var god skicka en ny nollställningsförfrågan." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Lösenordsnollställning lyckades" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -819,7 +775,7 @@ "Vi har skickat instruktioner för att sätta ert lösenord till er via e-post . " "De borde komma inom en snar framtid." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -827,7 +783,7 @@ "Om ni inte får ett e-brev, vänligen kontrollera att du har skrivit in " "adressen du registrerade dig med och kolla din skräppostmapp." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -836,24 +792,24 @@ "Du får detta e-postmeddelande för att du har begärt återställning av ditt " "lösenord av ditt konto på %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Var god gå till följande sida och välj ett nytt lösenord:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Ditt användarnamn (i fall du skulle ha glömt det):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Tack för att du använder vår webbplats!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s-teamet" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -861,28 +817,52 @@ "Glömt ditt lösenord? Fyll i din e-postadress nedan så skickar vi ett e-" "postmeddelande med instruktioner för hur du ställer in ett nytt." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "E-postaddress:" +msgstr "E-postadress:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Nollställ mitt lösenord" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Alla datum" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Ingen)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Välj %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Välj %s att ändra" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Datum:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Tid:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Uppslag" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Lägg till ytterligare" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Nuvarande:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Ändra:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sw/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# machaku , 2013 +# machaku , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-11-12 06:43+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-22 16:20+0000\n" "Last-Translator: machaku \n" "Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/" "sw/)\n" @@ -17,12 +17,12 @@ "Language: sw\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Yaliyomo: %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -32,38 +32,38 @@ "katika kisanduku hapo chini kisha kubofya mshale wa \"Chagua\" kati ya " "visanduku viwili." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Chapisha katika kisanduku hiki ili kuchuja orodha ya %s iliyopo." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Chuja" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Chagua vyote" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Bofya kuchagua %s kwa pamoja." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Chagua" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Ondoa" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Chaguo la %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,22 +73,24 @@ "katika kisanduku hapo chini kisha kubofya mshale wa \"Ondoa\" kati ya " "visanduku viwili." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Ondoa vyote" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Bofya ili kuondoa %s chaguliwa kwa pamoja." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "umechagua %(sel)s kati ya %(cnt)s" msgstr[1] "umechagua %(sel)s kati ya %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +98,8 @@ "Umeacha kuhifadhi mabadiliko katika uga zinazoharirika. Ikiwa utafanya tendo " "lingine, mabadiliko ambayo hayajahifadhiwa yatapotea." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -105,7 +108,8 @@ "Umechagua tendo, lakini bado hujahifadhi mabadiliko yako katika uga husika. " "Tafadali bofya Sawa ukitaka kuhifadhi. Utahitajika kufanya upya kitendo " -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -114,70 +118,86 @@ "Umechagua tendo, lakini bado hujahifadhi mabadiliko yako katika uga husika. " "Inawezekana unatafuta kitufe cha Nenda badala ya Hifadhi" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Januari Februari Machi Aprili Mei Juni Julai Agosti Septemba Oktoba Novemba " -"Desemba" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "J2 J3 J4 J5 IJ JM JP" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Onesha" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Ficha" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Kumbuka: Uko saa %s mbele ukilinganisha na majira ya seva" +msgstr[1] "Kumbuka: Uko masaa %s mbele ukilinganisha na majira ya seva" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Kumbuka: Uko saa %s nyuma ukilinganisha na majira ya seva" +msgstr[1] "Kumbuka: Uko masaa %s nyuma ukilinganisha na majira ya seva" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Sasa" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Saa" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Chagua wakati" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Usiku wa manane" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "Saa 12 alfajiri" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Adhuhuri" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Ghairi" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Leo" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Kalenda" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Jana" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Kesho" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Januari Februari Machi Aprili Mei Juni Julai Agosti Septemba Oktoba Novemba " +"Desemba" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "J2 J3 J4 J5 IJ JM JP" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Onesha" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Ficha" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/sw/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/sw/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/sw/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/sw/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/sw/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/sw/LC_MESSAGES/django.po 2015-01-27 17:12:29.000000000 +0000 @@ -1,13 +1,13 @@ # This file is distributed under the same license as the Django package. # # Translators: -# machaku , 2013 +# machaku , 2013-2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-11-12 08:35+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-22 16:16+0000\n" "Last-Translator: machaku \n" "Language-Team: Swahili (http://www.transifex.com/projects/p/django/language/" "sw/)\n" @@ -17,158 +17,161 @@ "Language: sw\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Umefanikiwa kufuta %(items)s %(count)d." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Huwezi kufuta %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Una uhakika?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Futa %(verbose_name_plural)s teule" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Utawala" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "yote" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Ndiyo" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Hapana" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Haijulikani" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Tarehe yoyote" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Leo" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Siku 7 zilizopita" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "mwezi huu" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Mwaka huu" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Tafadhali sahihisha %(username)s na nenosiri kwa akaunti ya mfanyakazi. " -"Kumbuka sehemu zote mbili zinaweza kuwa zinazingatia herufi kubwa na ndogo." +"Tafadhali ingiza %(username)s na nywila sahihi kwa akaunti ya msimamizi. " +"Kumbuka kuzingatia herufi kubwa na ndogo." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Tafadhali ingia tena, kwani kipindi chako cha matumizi kimekwisha." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Tendo" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "muda wa tendo" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "Kitambulisho cha kitu" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "`repr` ya kitu" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "bendera ya tendo" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "badilisha ujumbe" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "ingizo kwenye kumbukumbu" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "maingizo kwenye kumbukumbu" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Kuongezwa kwa \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Kubadilishwa kwa \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Kufutwa kwa \"%(object)s\"." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Kitu cha Ingizo la Kumbukumbu" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Hakuna" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Mabadiliko ya %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "na" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "Ingizo la \"%(object)s\" %(name)s " +msgstr "Ingizo la %(name)s \"%(object)s\" limefanyika " -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "Mabadiliko %(list)s kwa \"%(object)s\\v %(name)s." +msgstr "Mabadiliko %(list)s yamefanyoka kwa %(object)s \"%(name)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." -msgstr "Kumefutwa \"%(object)s\" %(name)s." +msgstr "Kumefutwa kwa %(name)s \"%(object)s\" kumefanyika." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Hakuna uga uliobadilishwa." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -176,7 +179,7 @@ "Ingizo la \"%(obj)s\" %(name)s limefanyika kwa mafanikio. Unaweza " "kuhariritena hapo chini." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -185,12 +188,12 @@ "Ingizo la \"%(obj)s\" %(name)s limefanyika kwa mafanikio. Unaweza tena " "kuongeza %(name)s hapo chini." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "Ingizo la \"%(obj)s\" %(name)s limefanyika kwa mafanikio." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -199,7 +202,7 @@ "Ingizo la \"%(obj)s\" %(name)s limebadilishwa kwa mafanikio. Unaweza tena " "kulihariri hapo chini." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -208,12 +211,12 @@ "Ingizo la \"%(obj)s\" %(name)s limebadilishwa kwa mafanikio. Unaweza " "kuongeza %(name)s hapo chini." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "Mabadiliko ya \"%(obj)s\" %(name)s yamefanikiwa." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -221,66 +224,66 @@ "Nilazima kuchagua vitu ili kufanyia kitu fulani. Hakuna kitu " "kilichochaguliwa." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Hakuna tendo lililochaguliwa" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Ongeza %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "Ufutaji wa \"%(obj)s\" %(name)s umefanikiwa." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Hakuna %(name)s yenye `primary key` %(key)r." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Ongeza %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Badilisha %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Hitilafu katika hifadhidata" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "mabadiliko ya %(name)s %(count)s yamefanikiwa." msgstr[1] "mabadiliko ya %(name)s %(count)s yamefanikiwa." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s kuchaguliwa" msgstr[1] "%(total_count)s (kila kitu) kuchaguliwa" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Vilivyo chaguliwa ni 0 kati ya %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "Ufutaji wa \"%(obj)s\" %(name)s umefanikiwa." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Badilisha historia: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(instance)s %(class_name)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " @@ -289,83 +292,71 @@ "Kufutwa kwa ingizo la %(instance)s %(class_name)s kutahitaji kufutwa kwa " "vitu vifuatavyo vyenye mahusiano vilivyokingwa: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Ingia" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Utawala wa tovuti ya django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Utawala wa Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Utawala wa tovuti" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "utawala %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Tarehe" - -#: widgets.py:91 -msgid "Time:" -msgstr "Saa" - -#: widgets.py:165 -msgid "Lookup" -msgstr "`Lookup`" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Ongeza" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Kwa sasa:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Ingia" -#: widgets.py:303 -msgid "Change:" -msgstr "Badilisha:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Utawala wa %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Ukurasa haujapatikana" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Samahani, ukurasa uliohitajika haukupatikana." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Sebule" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Hitilafu ya seva" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Hitilafu ya seva (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Hitilafu ya seva (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -373,120 +364,141 @@ "Kumekuwa na hitilafu. Imeripotiwa kwa watawala kupitia barua pepe na " "inatakiwa kurekebishwa mapema." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Fanya tendo lililochaguliwa." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Nenda" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Bofya hapa kuchagua viumbile katika kurasa zote" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Chagua kila %(module_name)s, (%(total_count)s). " -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Safisha chaguo" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Kwanza, ingiza jina lamtumiaji na nywila. Kisha, utaweza kuhariri zaidi " +"machaguo ya mtumiaji." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Ingiza jina la mtumiaji na nywila." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Badilisha nywila" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Tafadhali sahihisha makosa yafuatayo " + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Tafadhali sahihisha makosa yafuatayo." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "ingiza nywila ya mtumiaji %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Nywila" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Nywila (tena)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Ingiza nywila inayofanana na ya juu, kwa uthibitisho." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Karibu" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Nyaraka" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Badilisha nenosiri" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Toka" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Utawala wa tovuti ya django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Utawala wa Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Ongeza" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Historia" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Ona kwenye tovuti" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Tafadhali sahihisha makosa yafuatayo " - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Tafadhali sahihisha makosa yafuatayo." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Ongeza %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Chuja" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Ondoa katika upangaji" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Kipaumbele katika mpangilio: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Geuza mpangilio" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Futa" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -497,7 +509,7 @@ "vitu vinavyohuisana, lakini akaunti yako haina ruhusa ya kufuta vitu vya " "aina zifuatazo:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -506,7 +518,7 @@ "Kufuta '%(escaped_object)s' %(object_name)s kutahitaji kufuta vitu " "vifuatavyo ambavyo vinavyohuisana na vimelindwa:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -515,16 +527,16 @@ "Una uhakika kuwa unataka kufuta \"%(escaped_object)s\" %(object_name)s ? " "Vitu vyote vinavyohuisana kati ya vifuatavyo vitafutwa:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Ndiyo, Nina uhakika" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Futa viumbile mbalimbali" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -535,7 +547,7 @@ "vituvinavyohusiana, lakini akaunti yako haina ruhusa ya kufuta vitu vya " "vifuatavyo:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -544,7 +556,7 @@ "Kufutwa kwa %(objects_name)s kutahitaji kufutwa kwa vitu vifuatavyo vyenye " "uhusiano na vilivyolindwa:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -553,41 +565,56 @@ "Una uhakika kuwa unataka kufuta %(objects_name)s chaguliwa ? Vitu vyote kati " "ya vifuatavyo vinavyohusiana vitafutwa:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Ondoa" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Ongeza %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Futa?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " Kwa %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Models katika application %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Badilisha" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Huna ruhusa ya kuhariri chochote" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Matendo ya hivi karibuni" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Matendo yangu" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Hakuna kilichopatikana" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Maudhui hayajulikani" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -597,27 +624,27 @@ "kuwa majedwali sahihi ya hifadhidata yameundwa, na hakikisha hifadhidata " "inaweza kusomwana mtumiaji sahihi." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "nenosiri" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Umesahau jina na nenosiri lako?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Tarehe/saa" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Mtumiaji" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Tendo" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -625,201 +652,129 @@ "Kiumbile hiki hakina historia ya kubadilika. Inawezekana hakikuwekwa kupitia " "hii tovuti ya utawala." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Onesha yotee" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Hifadhi" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Tafuta" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "tokeo %(counter)s" msgstr[1] "matokeo %(counter)s" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "jumla %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Hifadhi kama mpya" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Hifadhi na ongeza" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Hifadhi na endelea kuhariri" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Kwanza, ingiza jina lamtumiaji na nenosiri. Kisha, utaweza kuhariri zaidi " -"machaguo ya mtumiaji." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Ingiza jina la mtumiaji na nenosiri." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "ingiza nenosiri la mtumiaji %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Nenosiri" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Nenosiri (tena)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Ingiza nenosiri linalofanana na la juu, kwa uthibitisho." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Ondoa" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Ongeza %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Futa?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Ahsante kwa kutumia muda wako katika Tovuti yetu leo. " -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "ingia tena" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" -msgstr "Badilisha nenosiri" +msgstr "Badilisha nywila" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Ubadilishaji wa nenosiri umefanikiwa" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." -msgstr "Nenosiri lako lilibadilishwa" +msgstr "Nywila yako imebadilishwa" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Tafadhali ingiza nenosiri lako la zamani, kwa ajili ya usalama, kisha ingiza " -"nenosiri jipya mara mbili ili tuweze kuthibitisha kuwa umelichapisha kwa " +"Tafadhali ingiza nywila yako ya zamani, kwa ajili ya usalama, kisha ingiza " +"nywila mpya mara mbili ili tuweze kuthibitisha kuwa umelichapisha kwa " "usahihi." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" -msgstr "Nenosiri la zamani" +msgstr "Nywila ya zamani" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" -msgstr "Nenosiri jipya" +msgstr "Nywila mpya" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" -msgstr "Badilisha nenosiri langu" +msgstr "Badilisha nywila yangu" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" -msgstr "Kuseti upya nenosiri" - -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Kuseti upya nenosiri kumekamilika" +msgstr "Kuseti nywila upya" -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." -msgstr "Nenosiri lako limesetiwa. Unaweza kuendelea na kuingia sasa." +msgstr "Nywila yako imesetiwa. Unaweza kuendelea na kuingia sasa." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" -msgstr "Uthibitisho wa kuseti upya nenosiri" +msgstr "Uthibitisho wa kuseti nywila upya" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Ingiza nenosiri" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -"Tafadhali ingiza nenosiri mara mbili ili tuweze kuthibitisha kuwa " +"Tafadhali ingiza nywila mpya mara mbili ili tuweze kuthibitisha kuwa " "umelichapisha kwa usahihi." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" -msgstr "Nenosiri jipya" +msgstr "Nywila mpya:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" -msgstr "Thibitisha nenosiri" - -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Kuseti upya nenosiri hakujafanikiwa" +msgstr "Thibitisha nywila" -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -"Kiungo cha kuseti upya nenosiri ni batili, inawezekana ni kwa sababu kiungo " -"hicho tayari kimetumika. tafadhali omba upya kuseti nenosiri" +"Kiungo cha kuseti nywila upya ni batili, inawezekana ni kwa sababu kiungo " +"hicho tayari kimetumika. tafadhali omba upya kuseti nywila." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Kuseti upya nenosiri kumefaninikiwa" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -"Tumekutumia maelekezo ya kuseti nenosiri lako. Unapaswa kuyapata ndani ya " -"muda mfupi." +"Tumekutumia maelekezo ya kuseti nywila yako. Unapaswa kuyapata ndani ya muda " +"mfupi." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -827,62 +782,86 @@ "Ikiwa hujapata barua pepe, tafadhali hakikisha umeingiza anuani ya barua " "pepe uliyoitumia kujisajili na angalia katika folda la spam" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -"Umepata barua pepe hii kwa sababu ulihitaji ku seti upya nenosiri la akaunti " +"Umepata barua pepe hii kwa sababu ulihitaji ku seti upya nywila ya akaunti " "yako ya %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" -msgstr "Tafadhali nenda ukurasa ufuatao na uchague nenosiri jipya:" +msgstr "Tafadhali nenda ukurasa ufuatao na uchague nywila mpya:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Jina lako la mtumiaji, ikiwa umesahau:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Ahsante kwa kutumia tovui yetu!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "timu ya %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -"Umesahau nenosiri? Ingiza anuani ya barua pepe hapo chini, nasi tutakutumia " -"maelekezo ya kuseti nenosiri jipya. " +"Umesahau nywila yako? Ingiza anuani yako ya barua pepe hapo chini, nasi " +"tutakutumia maelekezo ya kuseti nenosiri jipya. " -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Anuani ya barua pepe:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" -msgstr "Seti upya nenosiri langu" +msgstr "Seti nywila yangu upya" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Tarehe zote" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Hakuna)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Chagua %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Chaguo %s kwa mabadilisho" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Tarehe" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Saa" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "`Lookup`" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Ongeza" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Kwa sasa:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Badilisha:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ta/LC_MESSAGES/djangojs.po 2015-01-27 17:12:29.000000000 +0000 @@ -4,11 +4,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/" "ta/)\n" "MIME-Version: 1.0\n" @@ -17,153 +17,173 @@ "Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%s இருக்கிறதா " -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "வடிகட்டி" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "எல்லாவற்றையும் தேர்ந்த்தெடுக்க" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "அழிக்க" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%s தேர்ந்த்தெடுக்கப்பட்ட" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "ஜனவரி பிப்ரவரி மார்ச் ஏப்ரல் மே ஜூன் ஜூலை ஆகஸ்டு செப்டம்பர் அக்டோபர் நவம்பர் டிசம்பர்" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "ஞா தி செ பு வி வெ ச" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "இப்பொழுது " -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "கடிகாரம் " -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "ஒரு நேரத்தை தேர்ந்த்தெடுக்க " -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "நடு இரவு " -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "காலை 6 மணி " -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "மதியம் " -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "வேண்டாம் " -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "இன்று " -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "நாள்காட்டி " -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "நேற்று " -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "நாளை" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "ஜனவரி பிப்ரவரி மார்ச் ஏப்ரல் மே ஜூன் ஜூலை ஆகஸ்டு செப்டம்பர் அக்டோபர் நவம்பர் டிசம்பர்" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "ஞா தி செ பு வி வெ ச" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ta/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ta/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ta/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ta/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ta/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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Tamil (http://www.transifex.com/projects/p/django/language/" "ta/)\n" @@ -17,461 +17,473 @@ "Language: ta\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "உறுதியாக சொல்கிறீர்களா?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "அனைத்தும்" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "ஆம்" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "இல்லை" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "தெரியாத" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "எந்த தேதியும்" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "இன்று" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "கடந்த 7 நாட்களில்" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "இந்த மாதம்" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "இந்த வருடம்" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "செயல் நேரம்" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "பொருள் அடையாளம்" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "பொருள் உருவகித்தம்" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "செயர்குறி" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "செய்தியை மாற்று" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "புகுபதிவு உள்ளீடு" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "புகுபதிவு உள்ளீடுகள்" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s மாற்றபட்டுள்ளது." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "மற்றும்" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "எந்த புலமும் மாறவில்லை." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" "%(name)s \"%(obj)s\" வெற்றிகரமாக சேர்க்கப்பட்டுள்ளது. நீங்கள் கீழே தொகுக்க முடியும்." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாகச் சேர்க்கப்பட்டது." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக மாற்றப்பட்டது." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s யை சேர்க்க" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக அழிக்கப்பட்டுள்ளது." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s யை சேர்க்க" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s யை மாற்று" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "தகவல்சேமிப்பு பிழை" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" msgstr[1] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" msgstr[1] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" வெற்றிகரமாக அழிக்கப்பட்டுள்ளது." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "வரலாற்றை மாற்று: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "உள்ளே போ" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "டிஜாங்ஙோ தள நிர்வாகி" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "டிஜாங்ஙோ நிர்வாகம் " + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "இணைய மேலான்மை" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "தேதி:" - -#: widgets.py:91 -msgid "Time:" -msgstr "நேரம்:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "" - -#: widgets.py:260 -msgid "Add Another" -msgstr "" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "உள்ளே போ" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "பக்கத்தைக் காணவில்லை" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "நீங்கள் விரும்பிய பக்கத்தை காண இயலவில்லை,அதற்காக நாங்கள் வருந்துகிறோம்." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "வீடு" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "சேவகன் பிழை" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "சேவையகம் தவறு(500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "சேவையகம் பிழை(500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "செல்" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"முதலில்,பயனர்ப்பெயர் மற்றும் கடவுச்சொல்லை உள்ளிடவும்.அதன் பிறகு தான் நீங்கள் உங்கள் பெயரின் " +"விவரங்களை திருத்த முடியும்" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "கடவுச்சொல்லை மாற்று" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "கீழே உள்ள தவறுகளைத் திருத்துக" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "கடவுச்சொல்" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "கடவுச்சொல்(மறுபடியும்)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "நல்வரவு," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "ஆவனமாக்கம்" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "கடவுச்சொல்லை மாற்று" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "வெளியேறு" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "டிஜாங்ஙோ தள நிர்வாகி" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "டிஜாங்ஙோ நிர்வாகம் " - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "சேர்க்க" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "வரலாறு" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "தளத்தில் பார்" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "கீழே உள்ள தவறுகளைத் திருத்துக" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s சேர்க்க" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "வடிகட்டி" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "நீக்குக" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -481,14 +493,14 @@ "நீக்கும் '%(escaped_object)s' ஆனது %(object_name)s தொடர்புடைய மற்றவற்றையும் நீக்கும். " "ஆனால் அதை நீக்குவதற்குரிய உரிமை உங்களுக்கு இல்லை" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -497,16 +509,16 @@ "நீங்கள் இந்த \"%(escaped_object)s\" %(object_name)s நீக்குவதில் நிச்சயமா?தொடர்புடைய " "மற்றவையும் நீக்கப்படும். " -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "ஆம், எனக்கு உறுதி" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -514,55 +526,70 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "அழிக்க" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s ஆல்" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "மாற்றுக" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "உங்களுக்கு மாற்றுவதற்குரிய உரிமையில்லை" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "தற்போதைய செயல்கள்" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "எனது செயல்கள்" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "எதுவும் கிடைக்கவில்லை" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -572,139 +599,88 @@ "தகவல்சேமிப்பு அட்டவணையைதயாரிக்கவும். மேலும் பயனர் படிக்கும் படியான தகவல்சேமிப்பகத்தை " "உருவாக்கவும்." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "கடவுச்சொல்:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "தேதி/நேரம் " -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "பயனர்" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "செயல்" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" "இந்த பொருள் மாற்று வரலாற்றில் இல்லைஒரு வேளை நிர்வாகத்தளத்தின் மூலம் சேர்க்கப்படாமலிருக்கலாம்" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "எல்லாவற்றையும் காட்டு" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "சேமிக்க" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" msgstr[1] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s மொத்தம்" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "புதியதாக சேமி" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "சேமித்து இன்னுமொன்றைச் சேர்" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "சேமித்து மாற்றத்தை தொடருக" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"முதலில்,பயனர்ப்பெயர் மற்றும் கடவுச்சொல்லை உள்ளிடவும்.அதன் பிறகு தான் நீங்கள் உங்கள் பெயரின் " -"விவரங்களை திருத்த முடியும்" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "கடவுச்சொல்" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "கடவுச்சொல்(மறுபடியும்)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "மேலே அதே கடவுச்சொல்லை உள்ளிடவும், சரிபார்ப்பதற்காக ." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "அழிக்க" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "வலைத்தளத்தில் உங்களது பொன்னான நேரத்தை செலவழித்தமைக்கு மிகுந்த நன்றி" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "மீண்டும் உள்ளே பதிவு செய்யவும்" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "கடவுச்சொல் மாற்று" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "வெற்றிகரமாக கடவுச்சொல் மாற்றபட்டது" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "உங்களுடைய கடவுச்சொல் மாற்றபட்டது" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -712,138 +688,141 @@ "பாதுகாப்பு காரணங்களுக்காக , முதலில் உங்களது பழைய கடவுச்சொல்லை உள்ளிடுக. அதன் பிறகு " "புதிய கடவுச்சொல்லை இரு முறை உள்ளிடுக. இது உங்களது உள்ளிடுதலை சரிபார்க்க உதவும். " -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "கடவுச் சொல்லை மாற்றவும்" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "கடவுச்சொல்லை மாற்றியமை" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "புதிய கடவுச்சொல்:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "கடவுச்சொலின் மாற்றத்தை உறுதிப்படுத்து:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "கடவுச்சொல் மாற்றியமைத்தல் வெற்றி" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "உங்களது பயனாளர் பெயர், நீங்கள் மறந்திருந்தால்:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "எங்களது வலைத்தளத்தை பயன் படுத்தியதற்கு மிகுந்த நன்றி" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "இந்த %(site_name)s -இன் குழு" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "எனது கடவுச்சொல்லை மாற்றியமை" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "அனைத்து தேதியும்" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s யை தேர்ந்தெடு" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s யை மாற்ற தேர்ந்தெடு" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "தேதி:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "நேரம்:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/te/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -5,11 +5,11 @@ # 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-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/" "te/)\n" "MIME-Version: 1.0\n" @@ -18,153 +18,173 @@ "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "ఆందుబాతులోఉన్న %s " -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "వడపోత" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "అన్నీ ఎన్నుకోండి" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "తీసివేయండి" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "ఎన్నుకున్న %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" msgstr[1] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "ఙాన్వరి ఫిబ్రవరి మార్చి ఎప్రిల్ మే ఙూను ఙులై ఆగష్టు సెప్టెంబర్ అక్టోబర్ నవంబర్ డిసెంబర్" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "ఆ సో మం భు గు శు శ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "చూపించుము" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "దాచు" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ఇప్పుడు" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "గడియారము" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "ఒక సమయము ఎన్నుకోండి" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "ఆర్ధరాత్రి" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 a.m" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "మధ్యాహ్నము" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "రద్దు చేయు" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "ఈనాడు" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "కాలెండర్" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "నిన్న" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "రేపు" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "ఙాన్వరి ఫిబ్రవరి మార్చి ఎప్రిల్ మే ఙూను ఙులై ఆగష్టు సెప్టెంబర్ అక్టోబర్ నవంబర్ డిసెంబర్" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "ఆ సో మం భు గు శు శ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "చూపించుము" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "దాచు" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/te/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/te/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/te/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/te/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/te/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/te/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -4,13 +4,13 @@ # bhaskar teja yerneni , 2011 # Jannis Leidel , 2011 # ప్రవీణ్ ఇళ్ళ , 2011,2013 -# వీవెన్ వీరపనేని , 2011 +# వీవెన్ , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Telugu (http://www.transifex.com/projects/p/django/language/" "te/)\n" @@ -20,193 +20,196 @@ "Language: te\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s జయప్రదముగా తీసేవేయబడినది." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s తొలగించుట వీలుకాదు" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "మీరు ఖచ్చితంగా ఇలా చేయాలనుకుంటున్నారా?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "ఎంచుకోన్న %(verbose_name_plural)s తీసివేయుము " -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "అన్నీ" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "అవును" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "కాదు" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "తెలియనది" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "ఏ రోజైన" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "ఈ రోజు" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "గత 7 రోజుల గా" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "ఈ నెల" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "ఈ సంవత్సరం" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "దయచేసి మళ్ళీ లాగ్ ఇన్ అవ్వండి ఎందుకంటే మీ భాగము ముగిసింది ." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "చర్య:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "పని సమయము " -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "వస్తువు" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "వస్తువు" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "పని ఫ్లాగ్" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "సందేశము ని మార్చంది" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "లాగ్ ఎంట్రీ" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "లాగ్ ఎంట్రీలు" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "వొకటీ లేదు" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr " %s మార్చబడిండి" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "మరియు" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" జతచేయబడినది." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" కొరకు %(list)s మార్చబడినది." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" తొలగిబడినది" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "క్షేత్రములు ఏమి మార్చబడలేదు" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" జయప్రదంగా కలపబడ్డడి. మీరు మళ్ళీ దీనినీ క్రింద మార్చవచ్చు" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\"జయప్రదంగా కలపబడ్డడి" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" జయప్రదంగా మార్చబడిండి" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -214,268 +217,275 @@ "అంశములపయి తదుపరి చర్య తీసుకోనటకు వాటిని ఎంపిక చేసుకోవలెను. ప్రస్తుతం ఎటువంటి అంశములు " "మార్చబడలేదు." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "మీరు ఎటువంటి చర్య తీసుకొనలేదు " -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%sని జత చేయండి " +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" జయప్రదంగా తీసివేయబడ్డడి" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r ప్రధాన కీ గా వున్న %(name)s అంశం ఏమి లేదు." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%sని జత చేయండి " + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%sని మార్చుము" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "దత్తాంశస్థానము పొరబాటు " -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s జయప్రదముగా మార్చబడినవి." msgstr[1] "%(count)s %(name)s జయప్రదముగా మార్చబడినవి." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ఎంపికయినది." msgstr[1] "అన్ని %(total_count)s ఎంపికయినవి." -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 of %(cnt)s ఎంపికయినవి." -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" జయప్రదంగా తీసివేయబడ్డడి" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "చరిత్రం మార్చు: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "ప్రవేశించండి" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "జాంగొ యొక్క నిర్వాహణదారులు" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "జాంగొ నిర్వాహణ" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "సైట్ నిర్వాహణ" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s నిర్వాహణ" - -#: widgets.py:90 -msgid "Date:" -msgstr "తారీఖు:" - -#: widgets.py:91 -msgid "Time:" -msgstr "సమయం:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "అంశ శోధన." - -#: widgets.py:260 -msgid "Add Another" -msgstr "మరివొక కలుపు" - -#: widgets.py:302 -msgid "Currently:" -msgstr "ప్రస్తుతం" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "ప్రవేశించండి" -#: widgets.py:303 -msgid "Change:" -msgstr "మార్చు:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "పుట దొరకలేదు" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "క్షమించండి మీరు కోరిన పుట దొరకలేడు" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "నివాసము" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "సర్వర్ పొరబాటు" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "సర్వర్ పొరబాటు (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "సర్వర్ పొరబాటు (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "ఎంచుకున్న చర్యను నడుపు" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "వెళ్లు" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "ఎంపికను తుడిచివేయి" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "ఒక వాడుకరిపేరు మరియు సంకేతపదాన్ని ప్రవేశపెట్టండి." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "సంకేతపదాన్ని మార్చుకోండి" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "క్రింద ఉన్న తప్పులు సరిదిద్దుకోండి" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "సంకేతపదం" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "సంకేతపదం (మళ్ళీ)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "పైన ఇచ్చిన సంకేతపదాన్నే మళ్ళీ ఇవ్వండి, సరిచూత కోసం." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "సుస్వాగతం" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "పత్రీకరణ" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "సంకేతపదాన్ని మార్చుకోండి" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "నిష్క్రమించండి" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "జాంగొ యొక్క నిర్వాహణదారులు" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "జాంగొ నిర్వాహణ" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "చేర్చు" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "చరిత్ర" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "సైట్ లో చూడండి" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "క్రింద ఉన్న తప్పులు సరిదిద్దుకోండి" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s జత చేయు" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "వడపోత" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "క్రమీకరణ నుండి తొలగించు" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "తొలగించు" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -483,30 +493,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "అవును " -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -514,191 +524,157 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "తొలగించు" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "తొలగించాలా?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "మార్చు" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "మీకు ఏది మార్చటానికి అధికారము లేదు" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "ఇటీవలి చర్యలు" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "నా చర్యలు" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "ఏమి దొరకలేదు" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "తెలియని విషయం" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "సంకేతపదం:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "మీ సంకేతపదం లేదా వాడుకరిపేరును మర్చిపోయారా?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "తేదీ/సమయం" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "వాడుకరి" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "చర్య" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "అన్నీ చూపించు" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "భద్రపరుచు" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "వెతుకు" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s ఫలితం" msgstr[1] "%(counter)s ఫలితాలు" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s మొత్తము" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "కొత్త దాని లా దాచు" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "దాచి కొత్త దానిని కలపండి" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "దాచి మార్చుటా ఉందండి" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "ఒక వాడుకరిపేరు మరియు సంకేతపదాన్ని ప్రవేశపెట్టండి." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "సంకేతపదం" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "సంకేతపదం (మళ్ళీ)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "పైన ఇచ్చిన సంకేతపదాన్నే మళ్ళీ ఇవ్వండి, సరిచూత కోసం." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "తొలగించు" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "తొలగించాలా?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "మళ్ళీ ప్రవేశించండి" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "అనుమతి పదం మార్పు" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "అనుమతి పదం మార్పు జయప్రదమైండి " - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "మీ అనుమతి పదం మార్చబడిండి" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -706,46 +682,34 @@ "దయచేసి రక్షన కోసము, మీ పాత అనుమతి పదం ఇవ్వండి , కొత్త అనుమతి పదం రెండు సార్లు ఇవ్వండి , " "ఎం దుకంటే మీరు తప్పు ఇస్తే సరిచేయటానికి " -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "పాత సంకేతపదం" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "కొత్త సంకేతపదం" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "నా సంకేతపదాన్ని మార్చు" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "అనుమతి పదం తిరిగి అమర్చు" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "అనుమతి పదం తిరిగి మార్చు సంపూర్ణమైనది" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "మీ అనుమతి పదం మర్చుబడినది. మీరు ఇప్పుదు లాగ్ ఇన్ అవ్వచ్చు." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "అనుమతి పదం తిరిగి మార్చు ఖాయం చెయండి" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "కొత్త అనుమతి పదం ప్రవేశపెటండి" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -753,93 +717,108 @@ "దయచేసి రక్షన కోసము, మీ పాత అనుమతి పదం ఇవ్వండి , కొత్త అనుమతి పదం రెండు సార్లు ఇవ్వండి , " "ఎం దుకంటే మీరు తప్పు ఇస్తే సరిచేయటానికి " -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "కొత్త సంకేతపదం:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "సంకేతపదాన్ని నిర్ధారించండి:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "సంకేతపదపు మార్పు విఫలమైంది" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "సంకేతపదపు మార్పు విజయవంతం" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "మీ వాడుకరిపేరు, ఒక వేళ మీరు మర్చిపోయివుంటే:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "మా సైటుని ఉపయోగిస్తున్నందుకు ధన్యవాదములు!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s జట్టు" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "ఈమెయిలు చిరునామా:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "అనుమతిపదం తిరిగి అమర్చు" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "అన్నీ తేదీలు" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(ఏదీకాదు)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s ని ఎన్నుకోండి" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "%s ని మార్చటానికి ఎన్నుకోండి" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "తారీఖు:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "సమయం:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "అంశ శోధన." + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "మరివొక కలుపు" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "ప్రస్తుతం" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "మార్చు:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/th/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -6,11 +6,11 @@ # Suteepat Damrongyingsupab , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Thai (http://www.transifex.com/projects/p/django/language/" "th/)\n" "MIME-Version: 1.0\n" @@ -19,12 +19,12 @@ "Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "%sที่มีอยู่" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -33,38 +33,38 @@ "นี่คือรายการที่ใช้ได้ของ %s คุณอาจเลือกบางรายการโดยการเลือกไว้ในกล่องด้านล่างแล้วคลิกที่ปุ่ม " "\"เลือก\" ระหว่างสองกล่อง" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "พิมพ์ลงในช่องนี้เพื่อกรองรายการที่ใช้ได้ของ %s" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "ตัวกรอง" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "เลือกทั้งหมด" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "คลิกเพื่อเลือก %s ทั้งหมดในครั้งเดียว" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "เลือก" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "ลบออก" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "%sที่ถูกเลือก" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -73,21 +73,23 @@ "นี่คือรายการที่ถูกเลือกของ %s คุณอาจเอาบางรายการออกโดยการเลือกไว้ในกล่องด้านล่างแล้วคลิกที่ปุ่ม " "\"เอาออก\" ระหว่างสองกล่อง" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "เอาออกทั้งหมด" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "คลิกเพื่อเอา %s ออกทั้งหมดในครั้งเดียว" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(sel)s จาก %(cnt)s selected" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -95,7 +97,8 @@ "คุณยังไม่ได้บันทึกการเปลี่ยนแปลงในแต่ละฟิลด์ ถ้าคุณเรียกใช้คำสั่ง " "ข้อมูลที่ไม่ได้บันทึกการเปลี่ยนแปลงของคุณจะหายไป" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -104,7 +107,8 @@ "คุณได้เลือกคำสั่ง แต่คุณยังไม่ได้บันทึกการเปลี่ยนแปลงของคุณไปยังฟิลด์ กรุณาคลิก OK เพื่อบันทึก " "คุณจะต้องเรียกใช้คำสั่งใหม่อีกครั้ง" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -112,70 +116,84 @@ msgstr "" "คุณได้เลือกคำสั่งและคุณยังไม่ได้ทำการเปลี่ยนแปลงใด ๆ ในฟิลด์ คุณอาจมองหาปุ่มไปมากกว่าปุ่มบันทึก" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"มกราคม กุมภาพันธ์ มีนาคม เมษายน พฤษภาคม มิถุนายน กรกฎาคม สิงหาคม กันยายน ตุลาคม " -"พฤศจิกายน ธันวาคม" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "อา. จ. อ. พ. พฤ. ศ. ส." - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "แสดง" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "ซ่อน" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "ขณะนี้" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "นาฬิกา" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "เลือกเวลา" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "เที่ยงคืน" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "หกโมงเช้า" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "เที่ยงวัน" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "ยกเลิก" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "วันนี้" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "ปฏิทิน" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "เมื่อวาน" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "พรุ่งนี้" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"มกราคม กุมภาพันธ์ มีนาคม เมษายน พฤษภาคม มิถุนายน กรกฎาคม สิงหาคม กันยายน ตุลาคม " +"พฤศจิกายน ธันวาคม" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "อา. จ. อ. พ. พฤ. ศ. ส." + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "แสดง" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "ซ่อน" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/th/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/th/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/th/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/th/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/th/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/th/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -2,16 +2,16 @@ # # Translators: # Jannis Leidel , 2011 -# Kowit Charoenratchatabhan , 2013 -# Piti Ongmongkolkul , 2012 +# Kowit Charoenratchatabhan , 2013-2014 +# piti118 , 2012 # Suteepat Damrongyingsupab , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-07-21 20:33+0000\n" +"Last-Translator: Kowit Charoenratchatabhan \n" "Language-Team: Thai (http://www.transifex.com/projects/p/django/language/" "th/)\n" "MIME-Version: 1.0\n" @@ -20,193 +20,196 @@ "Language: th\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s ถูกลบเรียบร้อยแล้ว" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "ไม่สามารถลบ %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "แน่ใจหรือ" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "ลบ %(verbose_name_plural)s ที่เลือก" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "การจัดการ" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "ทั้งหมด" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "ใช่" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "ไม่ใช่" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "ไม่รู้" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "วันไหนก็ได้" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "วันนี้" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "สัปดาห์ที่แล้ว" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "เดือนนี้" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "ปีนี้" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "กรุณาใส่ %(username)s และรหัสผ่านให้ถูกต้อง มีการแยกแยะตัวพิมพ์ใหญ่-เล็ก" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "กรุณาลงชื่อเข้าใช้อีกครั้ง, เนื่องจากคุณไม่ได้ใช้งานนานเกินไป" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "คำสั่ง :" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "เวลาลงมือ" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "อ็อบเจ็กต์ไอดี" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "object repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "action flag" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "เปลี่ยนข้อความ" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "log entry" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "log entries" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" ถูกเพิ่ม" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" ถูกเปลี่ยน - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" ถูกลบ" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "อ็อบเจ็กต์ LogEntry" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "ไม่มี" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s เปลี่ยนแล้ว" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "และ" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "เพิ่ม %(name)s \"%(object)s\" แล้ว" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "เปลี่ยน %(list)s สำหรับ %(name)s \"%(object)s\" แล้ว" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "ลบ %(name)s \"%(object)s\" แล้ว" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "ไม่มีฟิลด์ใดถูกเปลี่ยน" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว เพิ่ม %(name)s ได้อีกที่ด้านล่าง" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "เพิ่ม %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว แก้ไขได้อีกที่ด้านล่าง" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว เพิ่ม %(name)s ได้อีกที่ด้านล่าง" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "เปลี่ยนแปลง %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -214,147 +217,137 @@ "ไม่มีรายการใดถูกเปลี่ยน\n" "รายการจะต้องถูกเลือกก่อนเพื่อที่จะทำตามคำสั่งได้" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "ไม่มีคำสั่งที่ถูกเลือก" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "เพิ่ม %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "ลบ %(name)s \"%(obj)s\" เรียบร้อยแล้ว" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "Primary key %(key)r ของอ็อบเจ็กต์ %(name)s ไม่มีอยู่" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "เพิ่ม %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "เปลี่ยน %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "เกิดความผิดพลาดที่ฐานข้อมูล" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(name)s จำนวน %(count)s อันได้ถูกเปลี่ยนแปลงเรียบร้อยแล้ว." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s ได้ถูกเลือก" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "เลือก 0 จาก %(cnt)s" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "ลบ %(name)s \"%(obj)s\" เรียบร้อยแล้ว" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "เปลี่ยนแปลงประวัติ: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"กำลังลบ %(class_name)s %(instance)s จะต้องมีการลบอ็อบเจ็คต์ป้องกันที่เกี่ยวข้อง : " +"%(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "เข้าสู่ระบบ" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "ผู้ดูแลระบบ Django" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "การจัดการ Django" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "การจัดการไซต์" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s การจัดการ" - -#: widgets.py:90 -msgid "Date:" -msgstr "วันที่ :" - -#: widgets.py:91 -msgid "Time:" -msgstr "เวลา :" - -#: widgets.py:165 -msgid "Lookup" -msgstr "ดูที่" - -#: widgets.py:260 -msgid "Add Another" -msgstr "เพิ่มอีก" - -#: widgets.py:302 -msgid "Currently:" -msgstr "ปัจจุบัน:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "เข้าสู่ระบบ" -#: widgets.py:303 -msgid "Change:" -msgstr "เปลี่ยนเป็น:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "การจัดการ %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "ไม่พบหน้านี้" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "เสียใจด้วย ไม่พบหน้าที่ต้องการ" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "หน้าหลัก" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "เซิร์ฟเวอร์ขัดข้อง" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "เซิร์ฟเวอร์ขัดข้อง (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "เซิร์ฟเวอร์ขัดข้อง (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -362,120 +355,139 @@ "เกิดเหตุขัดข้องขี้น ทางเราได้รายงานไปยังผู้ดูแลระบบแล้ว และจะดำเนินการแก้ไขอย่างเร่งด่วน " "ขอบคุณสำหรับการรายงานความผิดพลาด" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "รันคำสั่งที่ถูกเลือก" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "ไป" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "คลิกที่นี่เพื่อเลือกอ็อบเจ็กต์จากหน้าทั้งหมด" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "เลือกทั้งหมด %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "เคลียร์ตัวเลือก" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "ขั้นตอนแรก ใส่ชื่อผู้ใช้และรหัสผ่าน หลังจากนั้นคุณจะสามารถแก้ไขข้อมูลผู้ใช้ได้มากขึ้น" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "กรุณาใส่ชื่อผู้ใช้และรหัสผ่าน" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "เปลี่ยนรหัสผ่าน" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "โปรดแก้ไขข้อผิดพลาดด้านล่าง" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "กรุณาแก้ไขข้อผิดพลาดด้านล่าง" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "ใส่รหัสผ่านใหม่สำหรับผู้ใช้ %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "รหัสผ่าน" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "รหัสผ่าน (อีกครั้ง)" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "ยินดีต้อนรับ," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "เอกสารประกอบ" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "เปลี่ยนรหัสผ่าน" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "ออกจากระบบ" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "ผู้ดูแลระบบ Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "การจัดการ Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "เพิ่ม" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "ประวัติ" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "ดูที่หน้าเว็บ" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "โปรดแก้ไขข้อผิดพลาดด้านล่าง" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "เพิ่ม %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "ตัวกรอง" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "เอาออกจาก sorting" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "ลำดับการ sorting: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "เปิด/ปิด sorting" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "ลบ" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -485,7 +497,7 @@ "กำลังดำเนินการลบ %(object_name)s '%(escaped_object)s'และจะแสดงผลการลบ " "แต่บัญชีของคุณไม่สามารถทำการลบข้อมูลชนิดนี้ได้" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -493,7 +505,7 @@ msgstr "" "การลบ %(object_name)s '%(escaped_object)s' จำเป็นจะต้องลบอ็อบเจ็กต์ที่เกี่ยวข้องต่อไปนี้:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -502,16 +514,16 @@ "คุณแน่ใจหรือที่จะลบ %(object_name)s \"%(escaped_object)s\"?" "ข้อมูลที่เกี่ยวข้องทั้งหมดจะถูกลบไปด้วย:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "ใช่, ฉันแน่ใจ" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "ลบหลายอ็อบเจ็กต์" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -521,14 +533,14 @@ "การลบ %(objects_name)s ที่เลือก จะทำให้อ็อบเจ็กต์ที่เกี่ยวข้องถูกลบไปด้วย " "แต่บัญชีของคุณไม่มีสิทธิ์ที่จะลบอ็อบเจ็กต์ชนิดนี้" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "การลบ %(objects_name)s ที่ถูกเลือก จำเป็นจะต้องลบอ็อบเจ็กต์ที่เกี่ยวข้องต่อไปนี้:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -537,41 +549,56 @@ "คุณแน่ใจหรือว่า ต้องการลบ %(objects_name)s ที่ถูกเลือก? เนื่องจากอ็อบเจ็กต์ " "และรายการที่เกี่ยวข้องทั้งหมดต่อไปนี้จะถูกลบด้วย" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "ถอดออก" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "เพิ่ม %(verbose_name)s อีก" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "ลบ?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr " โดย %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "โมเดลในแอป %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "เปลี่ยนแปลง" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "คุณไม่สิทธิ์ในการเปลี่ยนแปลงข้อมูลใดๆ ได้" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "คำสั่งที่ผ่านมา" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "คำสั่งของฉัน" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "ไม่ว่าง" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "ไม่ทราบเนื้อหา" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -580,135 +607,86 @@ "มีสิ่งผิดปกติเกิดขึ้นกับการติดตั้งฐานข้อมูล กรุณาตรวจสอบอีกครั้งว่าฐานข้อมูลได้ถูกติดตั้งแล้ว " "หรือฐานข้อมูลสามารถอ่านและเขียนได้โคยผู้ใช้นี้" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "รหัสผ่าน:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "ลืมรหัสผ่านหรือชื่อผู้ใช้ของคุณหรือไม่" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "วันที่/เวลา" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "ผู้ใช้" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "คำสั่ง" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "อ็อบเจ็กต์นี้ไม่ได้แก้ไขประวัติ เป็นไปได้ว่ามันอาจจะไม่ได้ถูกเพิ่มเข้าไปโดยระบบ" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "แสดงทั้งหมด" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "บันทึก" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "ค้นหา" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s ผลลัพธ์" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s ทั้งหมด" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "บันทึกใหม่" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "บันทึกและเพิ่ม" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "บันทึกและกลับมาแก้ไข" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "ขั้นตอนแรก ใส่ชื่อผู้ใช้และรหัสผ่าน หลังจากนั้นคุณจะสามารถแก้ไขข้อมูลผู้ใช้ได้มากขึ้น" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "กรุณาใส่ชื่อผู้ใช้และรหัสผ่าน" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "ใส่รหัสผ่านใหม่สำหรับผู้ใช้ %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "รหัสผ่าน" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "รหัสผ่าน (อีกครั้ง)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "ใส่รหัสผ่านเหมือนด้านบน เพื่อตรวจสอบความถูกต้อง" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "ถอดออก" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "เพิ่ม %(verbose_name)s อีก" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "ลบ?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ขอบคุณที่สละเวลาอันมีค่าให้กับเว็บไซต์ของเราในวันนี้" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "เข้าสู่ระบบอีกครั้ง" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "เปลี่ยนรหัสผ่าน" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "เปลี่ยนรหัสผ่านสำเร็จ" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "รหัสผ่านของคุณถูกเปลี่ยนไปแล้ว" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -716,82 +694,61 @@ "กรุณาใส่รหัสผ่านเดิม ด้วยเหตุผลทางด้านการรักษาความปลอดภัย " "หลังจากนั้นให้ใส่รหัสผ่านใหม่อีกสองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "รหัสผ่านเก่า" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "รหัสผ่านใหม่" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "เปลี่ยนรหัสผ่านของฉัน" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "ตั้งค่ารหัสผ่านใหม่" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "ตั้งค่ารหัสผ่านใหม่เรียบร้อย" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "รหัสผ่านของคุณได้รับการตั้งค่าแล้ว คุณสามารถเข้าสู่ระบบได้ทันที" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "การยืนยันตั้งค่ารหัสผ่านใหม่" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "ใส่รหัสผ่านใหม่" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "กรุณาใส่รหัสผ่านใหม่สองครั้ง เพื่อตรวจสอบว่าคุณได้พิมพ์รหัสอย่างถูกต้อง" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "รหัสผ่านใหม่:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "ยืนยันรหัสผ่าน:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "การตั้งค่ารหัสผ่านใหม่ ไม่สำเร็จ" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" "การตั้งรหัสผ่านใหม่ไม่สำเร็จ เป็นเพราะว่าหน้านี้ได้ถูกใช้งานไปแล้ว กรุณาทำการตั้งรหัสผ่านใหม่อีกครั้ง" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "การตั้งค่ารหัสผ่านใหม่เรียบร้อย" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "เราได้ส่งอีเมลวิธีการตั้งรหัสผ่าน ไปที่อีเมลที่คุณให้ไว้เรียบร้อยแล้ว และคุณจะได้รับเร็วๆ นี้" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -799,7 +756,7 @@ "หากคุณไม่ได้รับอีเมล โปรดให้แน่ใจว่าคุณได้ป้อนอีเมลที่คุณลงทะเบียน " "และตรวจสอบโฟลเดอร์สแปมของคุณแล้ว" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -807,51 +764,75 @@ msgstr "" "คุณได้รับอีเมล์ฉบับนี้ เนื่องจากคุณส่งคำร้องขอเปลี่ยนรหัสผ่านสำหรับบัญชีผู้ใช้ของคุณที่ %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "กรุณาไปที่หน้านี้และเลือกรหัสผ่านใหม่:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "ชื่อผู้ใช้ของคุณ ในกรณีที่คุณถูกลืม:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "ขอบคุณสำหรับการใช้งานเว็บไซต์ของเรา" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s ทีม" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "ลืมรหัสผ่าน? กรุณาใส่อีเมลด้านล่าง เราจะส่งวิธีการในการตั้งรหัสผ่านใหม่ไปให้คุณทางอีเมล" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "อีเมล:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "ตั้งรหัสผ่านของฉันใหม่" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "ทุกวัน" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(ว่างเปล่า)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "เลือก %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "เลือก %s เพื่อเปลี่ยนแปลง" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "วันที่ :" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "เวลา :" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "ดูที่" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "เพิ่มอีก" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "ปัจจุบัน:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "เปลี่ยนเป็น:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/tr/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Burak Yavuz, 2014 # Jannis Leidel , 2011 # Metin Amiroff , 2011 # Murat Çorlu , 2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-07 13:12+0000\n" +"Last-Translator: Burak Yavuz\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/" "tr/)\n" "MIME-Version: 1.0\n" @@ -19,165 +20,186 @@ "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" -msgstr "Toplam %s" +msgstr "Mevcut %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -"Bu uygun %s listesidir. Aşağıdaki kutudan bazılarını işaretleyip, iki kutu " -"arasındaki \"Seç\" okuna basarak seçebilirsiniz." +"Bu mevcut %s listesidir. Aşağıdaki kutudan bazılarını işaretleyerek ve ondan " +"sonra iki kutu arasındaki \"Seçin\" okuna tıklayarak seçebilirsiniz." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." -msgstr "Uygun %s listesini filtrelemek için bu kutuya yazın." +msgstr "Mevcut %s listesini süzmek için bu kutu içine yazın." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" -msgstr "Filtre" +msgstr "Süzgeç" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" -msgstr "Hepsini seç" +msgstr "Tümünü seçin" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." -msgstr "Bütün %s bir kerede seçilsin istiyorsanız tıklayın. " +msgstr "Bir kerede tüm %s seçilmesi için tıklayın." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" -msgstr "Seç" +msgstr "Seçin" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Kaldır" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Seçilen %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -"Bu seçili %s listesidir. Aşağıdaki kutudan bazılarını işaretleyip, iki kutu " -"arasındaki \"Kaldır\" okuna tıklayarak kaldırabilirsiniz." +"Bu seçilen %s listesidir. Aşağıdaki kutudan bazılarını işaretleyerek ve " +"ondan sonra iki kutu arasındaki \"Kaldır\" okuna tıklayarak " +"kaldırabilirsiniz." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" -msgstr "Hepsini kaldır" +msgstr "Tümünü kaldır" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." -msgstr "Bütün seçili %s kaldırılsın istiyorsanız tıklayın." +msgstr "Bir kerede tüm seçilen %s kaldırılması için tıklayın." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" -msgstr[0] "%(sel)s / %(cnt)s seçili" -msgstr[1] "%(sel)s / %(cnt)s seçili" +msgstr[0] "%(sel)s / %(cnt)s seçildi" +msgstr[1] "%(sel)s / %(cnt)s seçildi" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -"Alanlara girilmiş ve henüz kaydedilmemiş değişiklikler mevcut. Eğer devam " -"ederseniz, kaydedilmemiş değişiklikleriniz yitirilecektir." +"Bireysel düzenlenebilir alanlarda kaydedilmemiş değişiklikleriniz var. Eğer " +"bir eylem çalıştırırsanız, kaydedilmemiş değişiklikleriniz kaybolacaktır." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -"Bir işlem seçtiniz, fakat bazı alanlardaki değişiklikleri henüz " -"kaydetmediniz. Kaydetmek için lütfen Tamam düğmesine tıklayınız. İşlemi " -"tekrarlamanız gerekecektir." +"Bir eylem seçtiniz, fakat henüz bireysel alanlara değişikliklerinizi " +"kaydetmediniz. Kaydetmek için lütfen TAMAM düğmesine tıklayın. Eylemi " +"yeniden çalıştırmanız gerekecek." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -"Bir işlem seçtiniz, fakat hiçbir alan üzerinde değişiklik yapmadınız. Bu " -"durumda Kaydet düğmesi yerine Git düğmesini kullanmanız önerilir." +"Bir eylem seçtiniz, fakat bireysel alanlar üzerinde hiçbir değişiklik " +"yapmadınız. Muhtemelen Kaydet düğmesi yerine Git düğmesini arıyorsunuz." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Ocak Şubat Mart Nisan Mayıs Haziran Temmuz Ağustos Eylül Ekim Kasım Aralık" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "P P S Ç P C C" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Göster" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Not: Sunucu saatinin %s saat ilerisindesiniz." +msgstr[1] "Not: Sunucu saatinin %s saat ilerisindesiniz." -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Gizle" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Not: Sunucu saatinin %s saat gerisindesiniz." +msgstr[1] "Not: Sunucu saatinin %s saat gerisindesiniz." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Şimdi" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Saat" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" -msgstr "Saat seçin" +msgstr "Bir saat seçin" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Geceyarısı" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "Sabah 6" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Öğle" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "İptal" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Bugün" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Takvim" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Dün" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Yarın" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Ocak Şubat Mart Nisan Mayıs Haziran Temmuz Ağustos Eylül Ekim Kasım Aralık" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "P P S Ç P C C" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Göster" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Gizle" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/tr/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/tr/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/tr/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/tr/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/tr/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,18 +1,21 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Caner BAŞARAN , 2013 -# cihad , 2012 +# Burak Yavuz, 2014 +# Caner Başaran , 2013 +# Cihad GÜNDOĞDU , 2012 +# Cihad GÜNDOĞDU , 2014 +# Cihan Okyay , 2014 # Jannis Leidel , 2011 -# mesutcang , 2013 +# Mesut Can Gürle , 2013 # Murat Sahin , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-24 13:14+0000\n" -"Last-Translator: Caner BAŞARAN \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-12 06:47+0000\n" +"Last-Translator: Burak Yavuz\n" "Language-Team: Turkish (http://www.transifex.com/projects/p/django/language/" "tr/)\n" "MIME-Version: 1.0\n" @@ -21,869 +24,851 @@ "Language: tr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." -msgstr "%(count)d adet %(items)s başarıyla silindi." +msgstr "%(count)d adet %(items)s başarılı olarak silindi." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" -msgstr "%(name)s silinemedi" +msgstr "%(name)s silinemiyor" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Emin misiniz?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Seçili %(verbose_name_plural)s nesnelerini sil" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Yönetim" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Tümü" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Evet" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Hayır" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Bilinmiyor" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Herhangi bir tarih" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Bugün" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Son 7 gün" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Bu ay" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Bu yıl" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -"Lütfen yönetici hesap için %(username)s ve parolanızı doğru giriniz. İkisi " -"de küçük harfe duyarlıdır." +"Lütfen görevli hesabı için %(username)s ve parolanızı doğru girin. İki " +"alanın da büyük küçük harfe duyarlı olabildiğini unutmayın." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Oturumunuzun süresi geçti. Lütfen tekrar giriş yapın." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" -msgstr "İşlem:" +msgstr "Eylem:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" -msgstr "işlem zamanı" +msgstr "eylem zamanı" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" -msgstr "nesne no" +msgstr "nesne kimliği" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "nesne kodu" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" -msgstr "işlem adı" +msgstr "eylem işareti" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" -msgstr "mesajı değiştir" +msgstr "iletiyi değiştir" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" -msgstr "log girdisi" +msgstr "günlük girdisi" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" -msgstr "log girdileri" +msgstr "günlük girdisi" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" eklendi." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" değiştirildi - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" silindi." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry Nesnesi" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" -msgstr "Hiç biri" +msgstr "Hiçbiri" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s değiştirildi." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "ve" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." -msgstr "%(name)s \"%(object)s\" eklenmiştir." +msgstr "%(name)s \"%(object)s\" eklendi." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." -msgstr "%(list)s %(name)s \"%(object)s\" ile değiştirildi." +msgstr "%(name)s \"%(object)s\" için %(list)s değiştirildi." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." -msgstr "%(name)s \"%(object)s\" silinmiştir." +msgstr "%(name)s \"%(object)s\" silindi." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." -msgstr "Hiçbir alan değiştirilmedi." +msgstr "Değiştirilen alanlar yok." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -"\"%(obj)s\" isimli %(name)s eklendi. Aşağıda tekrar düzenleyebilirsiniz." +"%(name)s \"%(obj)s\" başarılı olarak eklendi. Aşağıda tekrar " +"düzenleyebilirsiniz." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -"%(name)s \"%(obj)s\" başarıyla eklendi. Aşağıda başka %(name)s " +"%(name)s \"%(obj)s\" başarılı olarak eklendi. Aşağıda başka bir %(name)s " "ekleyebilirsiniz." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." -msgstr "\"%(obj)s\" isimli %(name)s eklendi." +msgstr "%(name)s \"%(obj)s\" başarılı olarak eklendi." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -"%(name)s \"%(obj)s\" başarıyla değiştirildi. Aşağıda tekrar " +"%(name)s \"%(obj)s\" başarılı olarak değiştirildi. Aşağıda tekrar " "düzenleyebilirsiniz." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -"%(name)s \"%(obj)s\" başarıyla değiştirildi. Aşağıda başka %(name)s " -"ekleyebilirsiniz." +"%(name)s \"%(obj)s\" başarılı olarak değiştirildi. Aşağıda başka bir " +"%(name)s ekleyebilirsiniz." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." -msgstr "\"%(obj)s\" isimli %(name)s değiştirildi." +msgstr "%(name)s \"%(obj)s\" başarılı olarak değiştirildi." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -"İşlemlerin uygulanabilmesi için bir veya daha fazla nesne seçilmelidir. " -"Herhangi bir değişiklik gerçekleştirilmedi." +"Bunlar üzerinde eylemlerin uygulanması için öğeler seçilmek zorundadır. Hiç " +"öğe değiştirilmedi." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." -msgstr "İşlem seçimi yapılmamış. Lütfen bir işlem seçiniz." +msgstr "Seçilen eylem yok." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s ekle" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" başarılı olarak silindi." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." -msgstr "%(key)r birincil anahtarına sahip %(name)s nesnesi mevcut değil." +msgstr "%(key)r birincil anahtarı olan %(name)s nesnesi mevcut değil." + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s ekle" -#: options.py:1207 +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s değiştir" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Veritabanı hatası" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." -msgstr[0] "%(count)s adet %(name)s başarıyla değiştirildi." -msgstr[1] "%(count)s adet %(name)s başarıyla değiştirildi." +msgstr[0] "%(count)s adet %(name)s başarılı olarak değiştirildi." +msgstr[1] "%(count)s adet %(name)s başarılı olarak değiştirildi." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" -msgstr[0] "Toplam %(total_count)s nesne seçili" -msgstr[1] "Toplam %(total_count)s nesne seçili" +msgstr[0] "%(total_count)s nesne seçildi" +msgstr[1] "Tüm %(total_count)s nesne seçildi" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" -msgstr "%(cnt)s nesne arasından seçim yapılmamış" - -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "\"%(obj)s\" isimli %(name)s silindi." +msgstr "0 / %(cnt)s nesne seçildi" -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" -msgstr "%s için değişiklik geçmişi:" +msgstr "Değişiklik geçmişi: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"%(object_name)s '%(escaped_object)s' silinmesi aşağıda gösterilen ilişkili " -"korunan nesnelerin de silinmesini gerektirir:" +"%(class_name)s %(instance)s silinmesi aşağıda korunan ilgili nesnelerin de " +"silinmesini gerektirecektir: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Giriş yap" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django site yöneticisi" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django yönetimi" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Site yönetimi" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s yönetimi" - -#: widgets.py:90 -msgid "Date:" -msgstr "Tarih:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Saat:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Arama" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Yenisini Ekle" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Şu anda:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Oturum aç" -#: widgets.py:303 -msgid "Change:" -msgstr "Değiştirin:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "%(app)s yönetimi" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Sayfa bulunamadı" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." -msgstr "Üzgünüz, aradığınız sayfa bulunamadı." +msgstr "Üzgünüz, istediğiniz sayfa bulunamadı." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" -msgstr "Anasayfa" +msgstr "Giriş" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Sunucu hatası" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Sunucu hatası (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Sunucu Hatası (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -"Bir hata oluştu. Site yöneticilerine e-posta ile rapor edildi ve kısa süre " -"içinde düzeltilecek. Sabrınız için teşekkür ederiz." +"Bir hata oluştu. Site yöneticilerine e-posta yoluyla bildirildi ve kısa süre " +"içinde düzeltilmelidir. Sabrınız için teşekkür ederiz." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" -msgstr "Seçili işlemi uygula" +msgstr "Seçilen eylemi çalıştır" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Git" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" -msgstr "Tüm sayfalardaki nesneleri seçmek için buraya tıklayınız" +msgstr "Tüm sayfalardaki nesneleri seçmek için buraya tıklayın" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Tüm %(total_count)s %(module_name)s nesnelerini seç" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" -msgstr "Seçimi kaldır" +msgstr "Seçimi temizle" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Önce, bir kullanıcı adı ve parola girin. Ondan sonra, daha fazla kullanıcı " +"seçeneğini düzenleyebileceksiniz." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Kullanıcı adı ve parola girin." -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Parolayı değiştir" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Lütfen aşağıdaki hataları düzeltin." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Lütfen aşağıdaki hataları düzeltin." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s kullanıcısı için yeni bir parola girin." -#: templates/admin/base.html:28 -msgid "Welcome," -msgstr "Hoşgeldiniz," +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Parola" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Documentation" -msgstr "Dokümantasyon" +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Parola (tekrar)" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Şifre değiştir" +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Doğrulama için yukarıdaki parolanın aynısını girin." -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Log out" -msgstr "Çık" +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "Hoş Geldiniz," -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django site yöneticisi" +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "Belgeler" -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django yönetimi" +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "Oturumu kapat" -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" -msgstr "Yeni" +msgstr "Ekle" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Geçmiş" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Sitede görüntüle" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Lütfen aşağıdaki hataları düzeltin." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "Lütfen aşağıdaki hataları düzeltin." - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" -msgstr "Yeni %(name)s" +msgstr "%(name)s ekle" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" -msgstr "Filtrele" +msgstr "Süz" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" -msgstr "Sıralamadan çıkar" +msgstr "Sıralamadan kaldır" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sıralama önceliği: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" -msgstr "Sıralama tercihi" +msgstr "Sıralamayı değiştir" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Sil" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " "related objects, but your account doesn't have permission to delete the " "following types of objects:" msgstr "" -"'%(escaped_object)s' isimli %(object_name)s nesnesini silmek, bağlantılı " -"nesnelerin silinmesini gerektiriyor, ancak aşağıdaki nesneleri silme " -"yetkiniz yok." +"%(object_name)s '%(escaped_object)s' nesnesinin silinmesi, ilgili nesnelerin " +"silinmesi ile sonuçlanacak, ancak hesabınız aşağıdaki nesnelerin türünü " +"silmek için izine sahip değil." -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -"%(object_name)s '%(escaped_object)s' silinmesi aşağıda gösterilen ilişkili " -"nesnelerin de silinmesini gerektirir:" +"%(object_name)s '%(escaped_object)s' nesnesinin silinmesi, aşağıda korunan " +"ilgili nesnelerin silinmesini gerektirecek:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -"\"%(escaped_object)s\" isimli %(object_name)s nesnesini silmek " -"istediğinizden emin misiniz? Aşağıdaki bağlantılı öğeler silinecek:" +"%(object_name)s \"%(escaped_object)s\" nesnesini silmek istediğinize emin " +"misiniz? Aşağıdaki ilgili öğelerin tümü silinecektir:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Evet, eminim" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Birden fazla nesneyi sil" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " "objects, but your account doesn't have permission to delete the following " "types of objects:" msgstr "" -"Seçili %(objects_name)s nesnelerinin silinmesi hesabınızın silme yetkisine " -"sahip olmadığı aşağıda gösterilen nesnelerin de silinmesini gerektirir:" +"Seçilen %(objects_name)s nesnelerinin silinmesi, ilgili nesnelerin silinmesi " +"ile sonuçlanacak, ancak hesabınız aşağıdaki nesnelerin türünü silmek için " +"izine sahip değil." -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -"Seçili %(objects_name)s nesnelerinin silinmesi aşağıda gösterilen ilişkili " -"nesnelerin silinmesini de gerektirir:" +"Seçilen %(objects_name)s nesnelerinin silinmesi, aşağıda korunan ilgili " +"nesnelerin silinmesini gerektirecek:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -"Seçili %(objects_name)s nesnelerini silmek istediğinizden emin misiniz? " -"Aşağıda gösterilen tüm nesneler ve ilişkili kalemler silinecektir:" +"Seçilen %(objects_name)s nesnelerini silmek istediğinize emin misiniz? " +"Aşağıdaki nesnelerin tümü ve onların ilgili öğeleri silinecektir:" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Kaldır" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Başka bir %(verbose_name)s ekle" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Silinsin mi?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " -msgstr " %(filter_title)s filtresi" +msgstr " %(filter_title)s süzgecine göre" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "%(name)s uygulamasındaki modeller" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" -msgstr "Düzenle" +msgstr "Değiştir" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." -msgstr "Düzenleme yapmaya yetkiniz yok." +msgstr "Hiçbir şeyi düzenlemek için izne sahip değilsiniz." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" -msgstr "İşlem Geçmişi" +msgstr "Son Eylemler" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" -msgstr "İşlemlerim" +msgstr "Eylemlerim" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" -msgstr "İşlem geçmişi bulunamadı" +msgstr "Mevcut değil" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Bilinmeyen içerik" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -"Veritabanı kurulumu ile ilgili bir problem var. İlgili veritabanı " -"tablolarının kurulu olduğundan ve veritabanının ilgili kullanıcı tarafından " +"Veritabanı kurulumunuz ile ilgili birşeyler yanlış. Uygun veritabanı " +"tablolarının oluşturulduğundan ve veritabanının uygun kullanıcı tarafından " "okunabilir olduğundan emin olun." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" -msgstr "Şifre:" +msgstr "Parola:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" -msgstr "Kullanıcı adını veya parolanı mı unuttun?" +msgstr "Kullanıcı adınızı veya parolanızı mı unuttunuz?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Tarih/saat" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Kullanıcı" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" -msgstr "İşlem" +msgstr "Eylem" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -"Bu nesnenin işlem geçmişi yok. Muhtemelen yönetici sayfası dışında bir " -"yerden eklendi." +"Bu nesne değişme geçmişine sahip değil. Muhtemelen bu yönetici sitesi " +"aracılığıyla eklenmedi." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Tümünü göster" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Kaydet" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Ara" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s sonuç" msgstr[1] "%(counter)s sonuç" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "toplam %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Yeni olarak kaydet" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" -msgstr "Kaydet ve yenisini ekle" +msgstr "Kaydet ve başka birini ekle" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Kaydet ve düzenlemeye devam et" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Önce bir kullanıcı adı ve şifre girin. Daha sonra daha fazla bilgi " -"girebilirsiniz." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Kullanıcı adı ve şifre girin." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s için yeni şifre girin." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Şifre" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Şifre (tekrar)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Onaylamak için, yukarıdaki şifrenin aynısını girin." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Sil" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Yeni bir %(verbose_name)s ekle" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Silinsin Mi?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." -msgstr "Web sitesinde bugün geçirdiğiniz zaman için teşekkür ederiz." +msgstr "" +"Bugün Web sitesinde biraz güzel zaman geçirdiğiniz için teşekkür ederiz." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" -msgstr "Tekrar giriş yap" +msgstr "Tekrar oturum aç" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" -msgstr "Şifre değişimi" - -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Şifre değişimi başarılı" +msgstr "Parola değiştime" -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." -msgstr "Şifreniz değiştirildi." +msgstr "Parolanız değiştirildi." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"Güvenliğiniz için, lütfen eski şifrenizi girin, sonra yeni şifrenizi iki " -"kere girerek doğru yazdığınızdan emin olun." +"Güvenliğiniz için, lütfen eski parolanızı girin, ve ondan sonra yeni " +"parolanızı iki kere girin böylece doğru olarak yazdığınızı doğrulayabilelim." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" -msgstr "Eski şifre" +msgstr "Eski parola" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" -msgstr "Yeni şifre" +msgstr "Yeni parola" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" -msgstr "Şifremi değiştir" +msgstr "Parolamı değiştir" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" -msgstr "Şifreyi sıfırla" +msgstr "Parolayı sıfırla" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Şifre sıfırlama tamamlandı" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." -msgstr "Şifreniz atanmıştır. Şimdi sisteme giriş yapabilirsiniz." +msgstr "Parolanız ayarlandı. Şimdi devam edebilir ve oturum açabilirsiniz." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" -msgstr "Şifre sıfırlama onayı" - -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Yeni şifreyi girin" +msgstr "Parola sıfırlama onayı" -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -"Lütfen yeni şifrenizi iki kere girin, böylece doğru yazdığınızdan emin olun." +"Lütfen yeni parolanızı iki kere girin böylece böylece doğru olarak " +"yazdığınızı doğrulayabilelim." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" -msgstr "Yeni şifre:" +msgstr "Yeni parola:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" -msgstr "Şifreyi onayla:" +msgstr "Parolayı onayla:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Şifre sıfırlaması başarısız oldu" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -"Şifre sıfırlama linki geçersiz bulunmuştur, büyük ihtimalle daha önce " -"kullanılmış olduğu içindir. Lütfen yeni bir şifre sıfırlama talebinde " -"bulunun." - -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Şifre başarıyla sıfırlandı" +"Parola sıfırlama bağlantısı geçersiz olmuş, çünkü zaten kullanılmış. Lütfen " +"yeni bir parola sıfırlama isteyin." -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -"Şifrenizin ayarlanması ile ilgili talimatlar, belirtmiş olduğunuz e-posta " -"adresine gönderildi. Yakın zamanda ulaşması beklenir." +"Parolanızın ayarlanması için talimatları size eposta ile gönderdik. Kısa " +"sürede almanız gerekir." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -"Eğer bir e-posta almadıysanız, lütfen kayıt olurken kullandığınız e-posta " -"adresini girdiğinizden emin olun. Spam klasörünü kontrol edin." +"Eğer bir e-posta almadıysanız, lütfen kayıt olurken girdiğiniz adresi " +"kullandığınızdan emin olun ve istenmeyen mesajlar klasörünü kontrol edin." -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -"Bu postayı %(site_name)s sitesindeki kullanıcı hesabınıza ait şifrenizi " -"sıfırlama talebinde bulunduğunuz için alıyorsunuz." +"Bu e-postayı alıyorsunuz çünkü %(site_name)s sitesindeki kullanıcı hesabınız " +"için bir parola sıfırlama istediniz." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" -msgstr "Lütfen bu sayfaya gidip yeni şifre seçin:" +msgstr "Lütfen şurada belirtilen sayfaya gidin ve yeni bir parola seçin:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" -msgstr "Unutma ihtimaline karşı, kullanıcı adınız:" +msgstr "Unutma ihtimalinize karşı, kullanıcı adınız:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Sitemizi kullandığınız için teşekkürler!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" -msgstr "%(site_name)s Ekibi" +msgstr "%(site_name)s ekibi" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -"Şifrenizi mi unuttunuz? Aşağıdaki alana e-posta adresinizi girin, yeni " -"şifreniz için gereken talimatları göndereceğiz." +"Parolanızı mı unuttunuz? Aşağıya e-posta adresinizi girin ve yeni bir tane " +"ayarlamak için talimatları e-posta ile gönderelim." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "E-posta adresi:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" -msgstr "Şifremi sıfırla" +msgstr "Parolamı sıfırla" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Tüm tarihler" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Yok)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s seç" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" -msgstr "Değiştirilecek %s nesnesini seçin" +msgstr "Değiştirmek için %s seçin" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Tarih:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Saat:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Arama" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Başka Birini Ekle" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Şu anda:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Değiştir:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/tt/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -4,11 +4,11 @@ # Azat Khasanshin , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/" "tt/)\n" "MIME-Version: 1.0\n" @@ -17,71 +17,73 @@ "Language: tt\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Рөхсәт ителгән %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Фильтр" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Барысын сайларга" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Бетерергә" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Сайланган %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s арасыннан %(sel)s сайланган" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -89,7 +91,8 @@ "Кайбер кырларда сакланмаган төзәтүләр кала. Сез гамәлне башкарсагыз, сезнең " "сакланмаган үзгәртүләр югалачаклар." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -99,7 +102,8 @@ "Аларны саклау өчен OK төймәсенә басыгыз. Аннан соң гамәлне тагын бер тапкыр " "башкарырга туры килер." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -108,70 +112,84 @@ "Сез гамәлне сайладыгыз һәм төзәтүләрне башкармадыгыз. Бәлки сез \"Сакларга\" " "төймәсе урынына \"Башкарырга\" төймәсен кулланырга теләдегез." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Гыйнвар Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь " -"Декабрь" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Я Д С Ч П Җ Ш" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Күрсәтергә" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Яшерергә" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Хәзер" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Сәгатьләр" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Вакыт сайлагыз" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Төн уртасы" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "Иртәнге 6" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Төш" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Юкка чыгарырга" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Бүген" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Календарь" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Кичә" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Иртәгә" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Гыйнвар Февраль Март Апрель Май Июнь Июль Август Сентябрь Октябрь Ноябрь " +"Декабрь" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Я Д С Ч П Җ Ш" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Күрсәтергә" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Яшерергә" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/tt/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/tt/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/tt/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/tt/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/tt/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/tt/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -2,13 +2,14 @@ # # Translators: # Azat Khasanshin , 2011 +# v_ildar , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-21 06:22+0000\n" +"Last-Translator: v_ildar \n" "Language-Team: Tatar (http://www.transifex.com/projects/p/django/language/" "tt/)\n" "MIME-Version: 1.0\n" @@ -17,156 +18,159 @@ "Language: tt\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s уңышлы рәвештә бетерелгән." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s бетереп булмады" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Сез инанып карар кылдыгызмы?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Сайланган %(verbose_name_plural)s бетерергә" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Барысы" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Әйе" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Юк" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Билгесез" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Теләсә нинди көн һәм вакыт" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Бүген" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Соңгы 7 көн" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Бу ай" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Бу ел" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Сезнең эш сеансыгыз искергән, зинһар, яңадан керегез." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Гамәл:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "гамәл вакыты" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "объект идентификаторы" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "объект фаразы" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "гамәл тибы" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "үзгәрү белдерүе" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "журнал язмасы" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "журнал язмалары" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Юк" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s үзгәртелгән." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "һәм" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" өстәлгән." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" өчен %(list)s үзгәртелгән." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" бетерелгән." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Үзгәртелгән кырлар юк." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -174,38 +178,38 @@ "%(name)s \"%(obj)s\" үңышлы рәвештә өстәлгән. Астарак сез аны тагын бер кат " "төзәтә аласыз." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" үңышлы рәвештә өстәлгән." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" уңышлы рәвештә үзгәртелгән." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -213,266 +217,275 @@ "Элементар өстеннән гамәл кылу өчен алар сайланган булырга тиеш. Элементлар " "үзгәртелмәгән." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Гамәл сайланмаган." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s өстәргә" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" уңышлы рәвештә бетерелгән." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(key)r беренчел ачкыч белән булган %(name)s юк." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s өстәргә" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s үзгәртергә" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Бирелмәләр базасы хатасы" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s уңышлы рәвештә үзгәртелгән." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s сайланган" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "Барлык %(cnt)s объектан 0 сайланган" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" уңышлы рәвештә бетерелгән." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Үзгәртү тарихы: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Керергә" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django сайты идарәсе" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django идарәсе" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Сайт идарәсе" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s идарә итү" - -#: widgets.py:90 -msgid "Date:" -msgstr "Көн:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Вакыт:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Эзләү" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Тагын өстәргә" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Керергә" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Сәхифә табылмаган" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Кызганычка каршы, соралган сәхифә табылмады." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Башбит" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Сервер хатасы" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Сервер хатасы (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Сервер хатасы (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Сайланган гамәлне башкарырга" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Башкарырга" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Барлык сәхифәләрдә булган объектларны сайлау өчен монда чирттерегез" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Бөтен %(total_count)s %(module_name)s сайларга" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Сайланганлыкны алырга" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Баштан логин һәм серсүзне кертегез. Аннан соң сез кулланучы турында күбрәк " +"мәгълүматне төзәтә алырсыз." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Логин һәм серсүзне кертегез." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Серсүзне үзгәртергә" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Зинһар, биредәге хаталарны төзәтегез." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "%(username)s кулланучы өчен яңа серсүзне кертегез." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Серсүз" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Серсүз (тагын бер тапкыр)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Тикшерү өчен шул ук серсүзне яңадан кертегез." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Рәхим итегез," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документация" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Серсүзне үзгәртергә" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Чыгарга" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django сайты идарәсе" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django идарәсе" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Өстәргә" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Тарих" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Сайтта карарга" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Зинһар, биредәге хаталарны төзәтегез." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s өстәргә" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Филтер" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Бетерергә" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -483,7 +496,7 @@ "объектларның бетерелүенә китерә ала, әмма сезнең хисап язмагызның киләсе " "объект тибларын бетерү өчен хокуклары җитми:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -492,7 +505,7 @@ "%(object_name)s '%(escaped_object)s' бетерүе киләсе сакланган объектларның " "бетерелүен таләп итә:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -501,16 +514,16 @@ "Сез инанып %(object_name)s \"%(escaped_object)s\" бетерергә телисезме? " "Барлык киләсе бәйләнгән объектлар да бетерелер:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Әйе, мин инандым" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Берничә объектны бетерергә" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -521,7 +534,7 @@ "бетерелүенә китерә ала, әмма сезнең хисап язмагызның киләсе объект тибларын " "бетерү өчен хокуклары җитми:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -530,7 +543,7 @@ "%(objects_name)s бетерүе киләсе аның белән бәйләнгән сакланган объектларның " "бетерелүен таләп итә:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -539,41 +552,56 @@ "Сез инанып %(objects_name)s бетерергә телисезме? Барлык киләсе объектлар һәм " "алар белән бәйләнгән элементлар да бетерелер:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Бетерергә" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Тагын бер %(verbose_name)s өстәргә" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Бетерергә?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "%(filter_title)s буенча" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Үзгәртергә" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Төзәтү өчен хокукларыгыз җитми." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Соңгы гамәлләр" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Минем гамәлләр" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Тарих юк" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Билгесез тип" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -582,27 +610,27 @@ "Сезнең бирелмәләр базасы дөрес итем көйләнмәгән. Тиешле җәдвәлләр төзелгәнен " "һәм тиешле кулланучының хокуклары җитәрлек булуын тикшерегез." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Серсүз:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Көн һәм вакыт" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Кулланучы" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Гамәл" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -610,111 +638,60 @@ "Әлеге объектның үзгәртү тарихы юк. Бу идарә итү сайты буенча өстәлмәгән " "булуы ихтимал." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Бөтенесен күрсәтергә" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Сакларга" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Эзләргә" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s нәтиҗә" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "барлыгы %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Яңа объект итеп сакларга" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Сакларга һәм бүтән объектны өстәргә" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Сакларга һәм төзәтүне дәвам итәргә" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Баштан логин һәм серсүзне кертегез. Аннан соң сез кулланучы турында күбрәк " -"мәгълүматне төзәтә алырсыз." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Логин һәм серсүзне кертегез." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "%(username)s кулланучы өчен яңа серсүзне кертегез." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Серсүз" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Серсүз (тагын бер тапкыр)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Тикшерү өчен шул ук серсүзне яңадан кертегез." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Бетерергә" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Тагын бер %(verbose_name)s өстәргә" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Бетерергә?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Сайтыбызда үткәргән вакыт өчен рәхмәт." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Тагын керергә" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Серсүзне үзгәртү" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Серсүз уңышлы рәвештә үзгәртелгән" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Серсүзегез үзгәртелгән." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -722,64 +699,48 @@ "Хәвефсезлек сәбәпле, зинһар, үзегезнең иске серсүзне кертегез, аннан яңа " "серсүзне ике тапкыр кертегез (дөрес язылышын тикшерү өчен)." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Иске серсүз" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Яңа серсүз" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Серсүземне үзгәртергә" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Серсүзне торгызу" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Серсүзне торгызу тәмамланган" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Серсүзегез үзгәртелгән. Сез хәзер керә аласыз." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Серсүзне торгызу раслау" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Яңа серсүзне кертегез:" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "Зинһар, тикшерү өчен яңа серсүзегезне ике тапкыр кертегез." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Яңа серсуз:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Серсүзне раслагыз:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Серсүзне торгызу хатасы" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -787,75 +748,94 @@ "Серсүзне торгызу өчен сылтама хаталы. Бәлки аның белән инде кулланганнар. " "Зинһар, серсүзне тагын бер тапкыр торгызып карагыз." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Серсүз уңышлы рәвештә торгызылган" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Зинһар, бу сәхифәгә юнәлегез һәм яңа серсүзне кертегез:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Сезнең кулланучы исемегез (оныткан булсагыз):" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Безнең сайтны куллану өчен рәхмәт!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s сайтының төркеме" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" -msgstr "" +msgstr "Эл. почта адресы:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Серсүземне торгызырга" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Бөтен көннәр" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Юк)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s сайлагыз" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Үзгәртү өчен %s сайлагыз" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Көн:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Вакыт:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Эзләү" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Тагын өстәргә" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po 2014-08-20 20:06:02.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/udm/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -3,10 +3,10 @@ # Translators: msgid "" msgstr "" -"Project-Id-Version: Django\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-03-23 02:35+0100\n" -"PO-Revision-Date: 2011-01-19 15:01+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2013-04-25 07:59+0000\n" "Last-Translator: Django team\n" "Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/" "udm/)\n" @@ -16,152 +16,170 @@ "Language: udm\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." msgstr "" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " "action." msgstr "" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " "button." msgstr "" -#: static/admin/js/calendar.js:26 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" - -#: static/admin/js/calendar.js:27 -msgid "S M T W T F S" -msgstr "" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" -#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" -#: static/admin/js/admin/DateTimeShortcuts.js:49 -#: static/admin/js/admin/DateTimeShortcuts.js:85 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:53 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:81 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:86 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:87 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:92 -#: static/admin/js/admin/DateTimeShortcuts.js:204 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:144 -#: static/admin/js/admin/DateTimeShortcuts.js:197 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:148 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:195 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/udm/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/udm/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/udm/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/udm/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/udm/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/udm/LC_MESSAGES/django.po 2015-01-27 17:12:30.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-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Udmurt (http://www.transifex.com/projects/p/django/language/" "udm/)\n" @@ -16,458 +16,468 @@ "Language: udm\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Бен" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Тодымтэ" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "" - -#: sites.py:386 -msgid "Site administration" -msgstr "" - -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "" - -#: widgets.py:90 -msgid "Date:" -msgstr "" - -#: widgets.py:91 -msgid "Time:" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" msgstr "" -#: widgets.py:165 -msgid "Lookup" +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" msgstr "" -#: widgets.py:260 -msgid "Add Another" +#: contrib/admin/sites.py:42 +msgid "Site administration" msgstr "" -#: widgets.py:302 -msgid "Currently:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" msgstr "" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 -#, python-format -msgid "%(name)s" +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." msgstr "" -#: templates/admin/base.html:28 -msgid "Welcome," +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." msgstr "" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Documentation" +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" msgstr "" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." msgstr "" -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Log out" +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." msgstr "" -#: templates/admin/base_site.html:4 -msgid "Django site admin" +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." msgstr "" -#: templates/admin/base_site.html:7 -msgid "Django administration" +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" msgstr "" -#: templates/admin/change_form.html:22 templates/admin/index.html:33 -msgid "Add" +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" msgstr "" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 -msgid "History" +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." msgstr "" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 -msgid "View on site" +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" msgstr "" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" msgstr "" -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "" + +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Ӵушоно" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -475,30 +485,30 @@ "following types of objects:" msgstr "" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " "following protected related objects:" msgstr "" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" msgstr "" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -506,327 +516,296 @@ "types of objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " "protected related objects:" msgstr "" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " "following objects and their related items will be deleted:" msgstr "" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Тупатъяно" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." msgstr "" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." msgstr "" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." msgstr "" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." msgstr "" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/uk/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,16 +1,17 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Alexander Chernihov , 2014 # Boryslav Larin , 2011 # Jannis Leidel , 2011 # Sergey Lysach , 2011-2012 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-24 12:11+0000\n" +"Last-Translator: Alexander Chernihov \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/" "language/uk/)\n" "MIME-Version: 1.0\n" @@ -20,12 +21,12 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "В наявності %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,39 +35,39 @@ "Це список всіх доступних %s. Ви можете обрати деякі з них, виділивши їх у " "полі нижче і натиснувшт кнопку \"Обрати\"." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" "Почніть вводити текст в цьому полі щоб відфільтрувати список доступних %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Фільтр" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Обрати всі" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Натисніть щоб обрати всі %s відразу." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Обрати" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Видалити" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Обрано %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -75,23 +76,25 @@ "Це список обраних %s. Ви можете видалити деякі з них, виділивши їх у полі " "нижче і натиснувши кнопку \"Видалити\"." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Видалити все" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Натисніть щоб видалити всі обрані %s відразу." -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "Обрано %(sel)s з %(cnt)s" msgstr[1] "Обрано %(sel)s з %(cnt)s" msgstr[2] "Обрано %(sel)s з %(cnt)s" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -99,7 +102,8 @@ "Ви зробили якісь зміни у деяких полях. Якщо Ви виконаєте цю дію, всі " "незбережені зміни буде втрачено." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -108,7 +112,8 @@ "Ви обрали дію, але не зберегли зміни в окремих полях. Будь ласка, натисніть " "ОК, щоб зберегти. Вам доведеться повторно запустити дію." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -117,70 +122,88 @@ "Ви обрали дію і не зробили жодних змін у полях. Ви, напевно, шукаєте кнопку " "\"Виконати\", а не \"Зберегти\"." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Січень Лютий Березень Квітень Травень Червень Липень Серпень Вересень " -"Жовтень Листопад Грудень" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "Нд Пн Вт Ср Чт Пт Сб" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Показати" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Сховати" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "Примітка: Ви на %s годину попереду серверного часу." +msgstr[1] "Примітка: Ви на %s години попереду серверного часу." +msgstr[2] "Примітка: Ви на %s годин попереду серверного часу." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "Примітка: Ви на %s годину позаду серверного часу." +msgstr[1] "Примітка: Ви на %s години позаду серверного часу." +msgstr[2] "Примітка: Ви на %s годин позаду серверного часу." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Зараз" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Годинник" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Оберіть час" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Північ" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Полудень" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Відмінити" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Сьогодні" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Календар" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Вчора" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Завтра" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Січень Лютий Березень Квітень Травень Червень Липень Серпень Вересень " +"Жовтень Листопад Грудень" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "Нд Пн Вт Ср Чт Пт Сб" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Показати" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Сховати" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/uk/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/uk/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/uk/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/uk/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/uk/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,16 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: +# Alexander Chernihov , 2014 # Boryslav Larin , 2011 # Jannis Leidel , 2011 +# Max V. Stotsky , 2014 # Sergiy Kuzmenko , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-24 09:11+0000\n" +"Last-Translator: Alexander Chernihov \n" "Language-Team: Ukrainian (http://www.transifex.com/projects/p/django/" "language/uk/)\n" "MIME-Version: 1.0\n" @@ -20,62 +22,68 @@ "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Успішно видалено %(count)d %(items)s." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Не можу видалити %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Ви впевнені?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Видалити обрані %(verbose_name_plural)s" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Адміністрування" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Всі" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Так" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Ні" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Невідомо" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Будь-яка дата" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Сьогодні" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "Останні 7 днів" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Цього місяця" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Цього року" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -84,94 +92,91 @@ "Будь ласка, введіть правильні %(username)s і пароль для облікового запису " "персоналу. Зауважте, що обидва поля можуть бути чутливі до регістру." -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Будь ласка, увійдіть знову, ваша сесія закінчилася." - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Дія:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "час дії" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "id об'єкту" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "представлення об'єкту(repr)" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "прапор дії" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "змінити повідомлення" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "реєстрування записів" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "реєстрування записів" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Додано \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Змінено \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Видалено \"%(object)s.\"" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "Запис у журналі" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Ніщо" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "Змінено %s." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "та" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "Додано %(name)s \"%(object)s\"." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "Змінено %(list)s для %(name)s \"%(object)s\"." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "Видалено %(name)s \"%(object)s\"." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Поля не змінені." -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -179,7 +184,7 @@ "%(name)s \"%(obj)s\" був успішно доданий. Ви модете редагувати його знову " "внизу." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -188,12 +193,12 @@ "%(name)s \"%(obj)s\" було успішно додано. Ви можете додати ще одну %(name)s " "нижче." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" було додано успішно." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -202,7 +207,7 @@ "%(name)s \"%(obj)s\" було успішно змінено. Ви можете знову відредагувати її " "нижче." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -211,42 +216,47 @@ "%(name)s \"%(obj)s\" було успішно змінено. Ви можете додати ще одну %(name)s " "нижче." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" був успішно змінений." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "" "Для виконання дії необхідно обрати елемент. Жодний елемент не був змінений." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Жодних дій не обрано." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Додати %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" був видалений успішно." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s об'єкт з первинним ключем %(key)r не існує." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Додати %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Змінити %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Помилка бази даних" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." @@ -254,7 +264,7 @@ msgstr[1] "%(count)s %(name)s були успішно змінені." msgstr[2] "%(count)s %(name)s було успішно змінено." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" @@ -262,112 +272,97 @@ msgstr[1] "%(total_count)s обрані" msgstr[2] "Усі %(total_count)s обрано" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 з %(cnt)s обрано" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" був видалений успішно." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Історія змін: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" -msgstr "" +msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" +"Видалення %(class_name)s %(instance)s вимагатиме видалення наступних " +"захищених пов'язаних об'єктів: %(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Увійти" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django сайт адміністрування" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django адміністрування" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Адміністрування сайта" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "Адміністрування %s" - -#: widgets.py:90 -msgid "Date:" -msgstr "Дата:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Час:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Пошук" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Додати інше" - -#: widgets.py:302 -msgid "Currently:" -msgstr "В даний час:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Увійти" -#: widgets.py:303 -msgid "Change:" -msgstr "Змінено:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Адміністрування %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Сторінка не знайдена" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Ми шкодуємо, але сторінка яку ви запросили, не знайдена." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Домівка" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Помилка сервера" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Помилка сервера (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Помилка сервера (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -376,120 +371,141 @@ "електронній пошті і вона повинна бути виправлена ​​найближчим часом. Дякуємо " "за ваше терпіння." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Виконати обрану дію" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Уперед" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Натисніть тут, щоб вибрати об'єкти на всіх сторінках" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Обрати всі %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Скинути вибір" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Спочатку, введіть ім'я користувача і пароль. Потім ви зможете редагувати " +"більше опцій користувача." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Введіть ім'я користувача і пароль." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Змінити пароль" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Будь ласка, виправте помилки нижче." + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Будь ласка, виправте помилки нижче." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "Додати %(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Введіть новий пароль для користувача %(username)s." -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Пароль" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Пароль (знову)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Повторіть пароль для перевірки." + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Вітаємо," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Документація" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Змінити пароль" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Вийти" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Django сайт адміністрування" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Django адміністрування" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Додати" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Історія" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Дивитися на сайті" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Будь ласка, виправте помилки нижче." - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Додати %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Відфільтрувати" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Видалити з сортування" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Пріорітет сортування: %(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Сортувати в іншому напрямку" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Видалити" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -500,7 +516,7 @@ "пов'язаних об'єктів, але ваш реєстраційний запис не має дозволу видаляти " "наступні типи об'єктів:" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -509,7 +525,7 @@ "Видалення %(object_name)s '%(escaped_object)s' вимагатиме видалення " "наступних пов'язаних об'єктів:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -518,16 +534,16 @@ "Ви впевнені що хочете видалити %(object_name)s \"%(escaped_object)s\"? Всі " "пов'язані записи, що перелічені, будуть видалені:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Так, я впевнений" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Видалити кілька об'єктів" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -537,7 +553,7 @@ "Видалення обраних %(objects_name)s вимагатиме видалення пов'язаних об'єктів, " "але ваш обліковий запис не має прав для видалення таких типів об'єктів:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -546,7 +562,7 @@ "Видалення обраних %(objects_name)s вимагатиме видалення наступних захищених " "пов'язаних об'єктів:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -555,41 +571,56 @@ "Ви впевнені, що хочете видалити вибрані %(objects_name)s? Всі наступні " "об'єкти та пов'язані з ними елементи будуть видалені:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Видалити" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Додати ще %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Видалити?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "За %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Моделі у %(name)s додатку" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Змінити" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "У вас немає дозволу редагувати будь-що." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Недавні дії" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Мої дії" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Немає" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Невідомий зміст" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -598,27 +629,27 @@ "Щось не так з інсталяцією бази даних. Перевірте, що таблиці бази даних " "створено і база даних може бути прочитана відповідним користувачем." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Пароль:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Забули пароль або ім'я користувача?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Дата/час" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Користувач" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Дія" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -626,19 +657,20 @@ "Цей об'єкт не має історії змін. Напевно, він був доданий не через цей сайт " "адміністрування." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Показати всі" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Зберегти" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Пошук" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" @@ -646,93 +678,41 @@ msgstr[1] "%(counter)s результати" msgstr[2] "%(counter)s результатів" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s всього" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Зберегти як нове" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Зберегти і додати інше" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Зберегти і продовжити редагування" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Спочатку, введіть ім'я користувача і пароль. Потім ви зможете редагувати " -"більше опцій користувача." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Введіть ім'я користувача і пароль." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Введіть новий пароль для користувача %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Пароль" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Пароль (знову)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Повторіть пароль для перевірки." - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Видалити" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Додати ще %(verbose_name)s" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Видалити?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Дякуємо за час, проведений сьогодні на сайті." -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Увійти знову" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Зміна паролю" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Зміна паролю успішна" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Ваш пароль було змінено." -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -740,46 +720,34 @@ "Будь ласка введіть ваш старий пароль, задля безпеки, потім введіть ваш новий " "пароль двічі, щоб ми могли перевірити, що ви ввели його правильно" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Старий пароль" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Новий пароль" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Змінити мій пароль" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Перевстановлення паролю" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Пароль перевстановлено" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Пароль встановлено. Ви можете увійти зараз." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Підтвердження перевстановлення паролю" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Новий пароль" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -787,19 +755,15 @@ "Будь ласка, введіть ваш старий пароль, задля безпеки, потім введіть ваш " "новий пароль двічі, щоб ми могли перевірити, що ви ввели його правильно." -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Новий пароль:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Підтвердіть пароль:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Пароль не перевстановлено" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -807,12 +771,7 @@ "Посилання на перевстановлення паролю було помилковим. Можливо тому, що воно " "було вже використано. Будь ласка, замовте нове перевстановлення паролю." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Пароль перевстановлено успішно" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -820,13 +779,15 @@ "На електронну адресу, яку ви ввели, ми надіслали вам листа з інструкціями " "щодо встановлення пароля. Ви повинні отримати його найближчим часом." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" +"Якщо Ви не отримали електронного листа, будь ласка, переконайтеся, що ввели " +"адресу яку вказували при реєстрації та перевірте папку зі спамом" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -835,24 +796,24 @@ "Ви отримали цей лист, тому що ви зробили запит на перевстановлення пароля " "для облікового запису користувача на %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Будь ласка, перейдіть на цю сторінку, та оберіть новий пароль:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "У разі, якщо ви забули, ваше ім'я користувача:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Дякуємо за користування нашим сайтом!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Команда сайту %(site_name)s " -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -860,28 +821,52 @@ "Забули пароль? Введіть свою email-адресу нижче і ми вишлемо інструкції по " "встановленню нового." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Email адреса:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Перевстановіть мій пароль" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Всі дати" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(None)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Вибрати %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Виберіть %s щоб змінити" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Дата:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Час:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Пошук" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Додати інше" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "В даний час:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Змінено:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ur/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -4,11 +4,11 @@ # Mansoorulhaq Mansoor , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" "Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/" "ur/)\n" "MIME-Version: 1.0\n" @@ -17,72 +17,74 @@ "Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "دستیاب %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " "the box below and then clicking the \"Choose\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "" -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "چھانٹیں" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "سب منتخب کریں" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "" -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "خارج کریں" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "منتخب شدہ %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " "box below and then clicking the \"Remove\" arrow between the two boxes." msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] "%(cnt)s میں سے %(sel)s منتخب کیا گیا" msgstr[1] "%(cnt)s میں سے %(sel)s منتخب کیے گئے" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -90,7 +92,8 @@ "آپ کے پاس ذاتی قابل تدوین خانوں میں غیر محفوظ تبدیلیاں موجود ھیں۔ اگر آپ " "کوئی کاروائی کریں گے تو آپ کی غیر محفوظ تبدیلیاں ضائع ھو جائیں گی۔" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -100,7 +103,8 @@ "تبدیلیاں محفوظ نہیں کی ہیں براہ مھربانی محفوط کرنے کے لئے OK پر کلک کریں۔ آپ " "کاوائی دوبارہ چلانے کی ضرورت ھوگی۔" -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -109,68 +113,84 @@ "آپ نے ایک کاروائی منتخب کی ھے، اور آپ نے ذاتی خانوں میں کوئی تبدیلی نہیں کی " "غالباً آپ 'جاؤ' بٹن تلاش کر رھے ھیں بجائے 'مخفوظ کریں' بٹن کے۔" -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "جنوری فروری مارچ اپریل مئی جون جولائی اگست ستمبر اکتوبر نومبر دسمبر" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "ا س م ب ج جمعہ ھ" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "دکھائیں" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "چھپائیں" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +msgstr[1] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +msgstr[1] "" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "اب" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "گھڑی" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "وقت منتخب کریں" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "نصف رات" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 ص" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "دوپھر" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "منسوخ کریں" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "آج" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "تقویم" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "گزشتہ کل" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "آئندہ کل" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "جنوری فروری مارچ اپریل مئی جون جولائی اگست ستمبر اکتوبر نومبر دسمبر" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "ا س م ب ج جمعہ ھ" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "دکھائیں" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "چھپائیں" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/ur/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/ur/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/ur/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/ur/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/ur/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/ur/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -4,10 +4,10 @@ # Mansoorulhaq Mansoor , 2011 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:18+0000\n" "Last-Translator: Jannis Leidel \n" "Language-Team: Urdu (http://www.transifex.com/projects/p/django/language/" "ur/)\n" @@ -17,156 +17,159 @@ "Language: ur\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "%(count)d %(items)s کو کامیابی سے مٹا دیا گیا۔" -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "%(name)s نہیں مٹایا جا سکتا" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "آپ کو یقین ھے؟" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "منتخب شدہ %(verbose_name_plural)s مٹائیں" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "تمام" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "ھاں" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "نھیں" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "نامعلوم" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "کوئی تاریخ" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "آج" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "گزشتہ سات دن" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "یہ مھینہ" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "یہ سال" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." msgstr "" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "براہ مھربانی دوباہ اندر جائیں، کیونکہ آپ کی نشست کی مدت ختم ھو چکی ھے۔" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "کاروائی:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "کاروائی کا وقت" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "شے کا شناختی نمبر" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "شے کا نمائندہ" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "کاروائی کا پرچم" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "پیغام تبدیل کریں" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "لاگ کا اندراج" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "لاگ کے اندراج" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "" -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "" -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "کوئی نھیں" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s تبدیل کریں۔" -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "اور" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" کا اضافہ کیا گیا۔" -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" %(list)s کی تبدیلی کی گئی۔" -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" مٹایا گیا۔۔" -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "کوئی خانہ تبدیل نھیں کیا گیا۔" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -174,38 +177,38 @@ "%(name)s \"%(obj)s\" کا کامیابی سے اضافہ کیا گیا۔ نیچے آپ دوبارہ اسے مدوّن کر " "سکتے ھیں۔" -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" کا کامیابی سے اضافہ کیا گیا۔" -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "" -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "" -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" کی تبدیلی کامیابی سے ھو گئی۔" -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -213,268 +216,277 @@ "اشیاء پر کاروائی سرانجام دینے کے لئے ان کا منتخب ھونا ضروری ھے۔ کوئی شے " "تبدیل نھیں کی گئی۔" -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "کوئی کاروائی منتخب نھیں کی گئی۔" -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "%s کا اضافہ کریں" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" کامیابی سے مٹایا گیا تھا۔" -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "%(name)s شے %(key)r پرائمری کلید کے ساتھ موجود نھیں ھے۔" -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "%s کا اضافہ کریں" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "%s تبدیل کریں" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "ڈیٹا بیس کی خرابی" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "%(count)s %(name)s کامیابی سے تبدیل کیا گیا تھا۔" msgstr[1] "%(count)s %(name)s کامیابی سے تبدیل کیے گئے تھے۔" -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "%(total_count)s منتخب کیا گیا۔" msgstr[1] "تمام %(total_count)s منتخب کئے گئے۔" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s میں سے 0 منتخب کیا گیا۔" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" کامیابی سے مٹایا گیا تھا۔" - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "%s کی تبدیلی کا تاریخ نامہ" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "اندر جائیں" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "منتظم برائے جینگو سائٹ" -#: sites.py:386 +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "انتظامیہ برائے جینگو سائٹ" + +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "سائٹ کی انتظامیہ" -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s کی انتظامیہ" - -#: widgets.py:90 -msgid "Date:" -msgstr "تاریخ:" - -#: widgets.py:91 -msgid "Time:" -msgstr "وقت:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "ڈھونڈیں" - -#: widgets.py:260 -msgid "Add Another" -msgstr "اور اضافہ کریں" - -#: widgets.py:302 -msgid "Currently:" -msgstr "" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "اندر جائیں" -#: widgets.py:303 -msgid "Change:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" msgstr "" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "صفحہ نھیں ملا" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "ھم معذرت خواہ ھیں، مطلوبہ صفحہ نھیں مل سکا۔" -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "گھر" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "سرور کی خرابی" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "سرور کی خرابی (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "سرور کی خرابی (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." msgstr "" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "منتخب شدہ کاروائیاں چلائیں" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "جاؤ" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "تمام صفحات میں سے اشیاء منتخب کرنے کے لئے یہاں کلک کریں۔" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "تمام %(total_count)s %(module_name)s منتخب کریں" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "انتخاب صاف کریں" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"پہلے نام صارف اور لفظ اجازت درج کریں۔ پھر آپ مزید صارف کے حقوق مدوّن کرنے کے " +"قابل ھوں گے۔" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "نام صارف اور لفظ اجازت درج کریں۔" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "لفظ اجازت تبدیل کریں" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "براہ کرم نیچے غلطیاں درست کریں۔" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "صارف %(username)s کے لئے نیا لفظ اجازت درج کریں۔" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "لفظ اجازت" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "لفظ اجازت (دوبارہ)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "توثیق کے لئے ویسا ہی لفظ اجازت درج کریں جیسا اوپر کیا۔" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "خوش آمدید،" -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "طریق استعمال" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "لفظ اجازت تبدیل کریں" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "باہر جائیں" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "منتظم برائے جینگو سائٹ" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "انتظامیہ برائے جینگو سائٹ" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "اضافہ" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "تاریخ نامہ" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "سائٹ پر مشاھدہ کریں" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "براہ کرم نیچے غلطیاں درست کریں۔" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "%(name)s کا اضافہ کریں" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "چھانٹیں" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "مٹائیں" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -485,7 +497,7 @@ "سکتی ھیں، مگر آپ کے کھاتے کو اشیاء کی مندرجہ ذیل اقسام مٹانے کا حق حاصل نھیں " "ھے۔" -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -494,7 +506,7 @@ "%(object_name)s '%(escaped_object)s' کو مٹانے کے لئے مندرجہ ذیل محفوظ متعلقہ " "اشیاء کو مٹانے کی ضرورت پڑ سکتی ھے۔" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -503,16 +515,16 @@ "واقعی آپ %(object_name)s \"%(escaped_object)s\" کو مٹانا چاہتے ھیں۔ مندرجہ " "ذیل تمام متعلقہ اجزاء مٹ جائیں گے۔" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "ھاں، مجھے یقین ھے" -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "متعدد اشیاء مٹائیں" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -522,7 +534,7 @@ "منتخب شدہ %(objects_name)s کو مٹانے کے نتیجے میں متعلقہ اشیاء مٹ سکتی ھیں، " "لیکن آپ کے کھاتے کو اشیاء کی مندرجہ ذیل اقسام کو مٹانے کا حق حاصل نھیں ھے۔" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -531,7 +543,7 @@ "منتخب شدہ %(objects_name)s کو مٹانے کے لئے مندرجہ ذیل محفوظ شدہ اشیاء کو " "مٹانے کی ضرورت پڑ سکتی ھے۔" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -540,41 +552,56 @@ "واقعی آپ منتخب شدہ %(objects_name)s مٹانا چاھتے ھیں؟ مندرجہ ذیل اور ان سے " "متعلقہ تمام اشیاء حذف ھو جائیں گی۔" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "خارج کریں" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "دوسرا %(verbose_name)s درج کریں" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "مٹاؤں؟" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "از %(filter_title)s" -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "تدوین" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "آپ کو کوئی چیز مدوّن کرنے کا حق نھیں ھے۔" -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "حالیہ کاروائیاں" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "میری کاروائیاں" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "کچھ دستیاب نھیں" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "نامعلوم مواد" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -584,27 +611,27 @@ "ٹیبل بنائے گئے تھے، اور یقین کر لیں کہ ڈیٹ بیس مناسب صارف کے پڑھے جانے کے " "قابل ھے۔" -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "لفظ اجازت:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "تاریخ/وقت" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "صارف" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "کاروائی" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -612,112 +639,61 @@ "اس شے کا تبدیلی کا تاریخ نامہ نھیں ھے۔ اس کا غالباً بذریعہ اس منتظم سائٹ کے " "اضافہ نھیں کیا گیا۔" -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "تمام دکھائیں" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "محفوظ کریں" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "تلاش کریں" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s نتیجہ" msgstr[1] "%(counter)s نتائج" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "کل %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "بطور نیا محفوظ کریں" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "محفوظ کریں اور مزید اضافہ کریں" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "محفوظ کریں اور تدوین جاری رکھیں" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"پہلے نام صارف اور لفظ اجازت درج کریں۔ پھر آپ مزید صارف کے حقوق مدوّن کرنے کے " -"قابل ھوں گے۔" - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "نام صارف اور لفظ اجازت درج کریں۔" - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "صارف %(username)s کے لئے نیا لفظ اجازت درج کریں۔" - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "لفظ اجازت" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "لفظ اجازت (دوبارہ)" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "توثیق کے لئے ویسا ہی لفظ اجازت درج کریں جیسا اوپر کیا۔" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "خارج کریں" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "دوسرا %(verbose_name)s درج کریں" - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "مٹاؤں؟" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "ویب سائٹ پر آج کچھ معیاری وقت خرچ کرنے کے لئے شکریہ۔" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "دوبارہ اندر جائیں" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "لفظ اجازت کی تبدیلی" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "لفظ اجازت کی تبدیلی کامیابی سے ھوگئی" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "آپ کا لفظ اجازت تبدیل کر دیا گیا تھا۔" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -725,48 +701,36 @@ "براہ کرم سیکیورٹی کی خاطر اپنا پرانا لفظ اجازت درج کریں اور پھر اپنا نیا لفظ " "اجازت دو مرتبہ درج کریں تاکہ ھم توثیق کر سکیں کہ آپ نے اسے درست درج کیا ھے۔" -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "پرانا لفظ اجازت" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "نیا لفظ اجازت" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "میرا لفظ تبدیل کریں" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "لفظ اجازت کی دوبارہ ترتیب" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "لفظ اجازت کی دوبارہ ترتیب مکمل ھو گئی" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "" "آپ کا لفظ اجازت مرتب کر دیا گیا ھے۔ آپ کو آگے بڑھنے اور اندر جانے کی اجازت " "ھے۔" -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "لفظ اجازت دوبارہ مرتب کرنے کی توثیق" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "نیا لفظ اجازت درج کریں" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -774,19 +738,15 @@ "براہ مھربانی اپنا نیا لفظ اجازت دو مرتبہ درج کریں تاکہ تاکہ ھم تصدیق کر سکیں " "کہ تم نے اسے درست درج کیا ھے۔" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "نیا لفظ اجازت:" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "لفظ اجازت کی توثیق:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "لفظ اجازت کی دوبارہ ترتیب ناکام ھو گئی۔" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -794,75 +754,94 @@ "لفظ اجازت دوبارہ مرتب کرنے کا رابطہ (لنک) غلط تھا، غالباً یہ پہلے ھی استعمال " "کیا چکا تھا۔ براہ مھربانی نیا لفظ اجازت مرتب کرنے کی درخواست کریں۔" -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "لفظ اجازت کی دوبارہ ترتیب کامیاب ھو گئی۔" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." msgstr "" -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." msgstr "" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " "user account at %(site_name)s." msgstr "" -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "براہ مھربانی مندرجہ ذیل صفحے پر جائیں اور نیا لفظ اجازت پسند کریں:" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "نام صارف، بھول جانے کی صورت میں:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "ھماری سائٹ استعمال کرنے کے لئے شکریہ" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "%(site_name)s کی ٹیم" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "میرا لفظ اجازت دوبارہ مرتب کریں" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "تمام تاریخیں" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(None)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "%s منتخب کریں" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "تبدیل کرنے کے لئے %s منتخب کریں" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "تاریخ:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "وقت:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "ڈھونڈیں" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "اور اضافہ کریں" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/vi/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -5,13 +5,14 @@ # Tran , 2011 # Tran Van , 2013 # Vuong Nguyen , 2011 +# xgenvn , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-05-26 16:59+0000\n" -"Last-Translator: Tran Van \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-07 19:06+0000\n" +"Last-Translator: xgenvn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/" "language/vi/)\n" "MIME-Version: 1.0\n" @@ -20,12 +21,12 @@ "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: static/admin/js/SelectFilter2.js:45 +#: contrib/admin/static/admin/js/SelectFilter2.js:45 #, c-format msgid "Available %s" msgstr "Có sẵn %s" -#: static/admin/js/SelectFilter2.js:46 +#: contrib/admin/static/admin/js/SelectFilter2.js:46 #, c-format msgid "" "This is the list of available %s. You may choose some by selecting them in " @@ -34,38 +35,38 @@ "Danh sách các lựa chọn đang có %s. Bạn có thể chọn bằng bách click vào mũi " "tên \"Chọn\" nằm giữa hai hộp." -#: static/admin/js/SelectFilter2.js:53 +#: contrib/admin/static/admin/js/SelectFilter2.js:53 #, c-format msgid "Type into this box to filter down the list of available %s." msgstr "Bạn hãy nhập vào ô này để lọc các danh sách sau %s." -#: static/admin/js/SelectFilter2.js:57 +#: contrib/admin/static/admin/js/SelectFilter2.js:57 msgid "Filter" msgstr "Lọc" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 msgid "Choose all" msgstr "Chọn tất cả" -#: static/admin/js/SelectFilter2.js:61 +#: contrib/admin/static/admin/js/SelectFilter2.js:61 #, c-format msgid "Click to choose all %s at once." msgstr "Click để chọn tất cả %s ." -#: static/admin/js/SelectFilter2.js:67 +#: contrib/admin/static/admin/js/SelectFilter2.js:67 msgid "Choose" msgstr "Chọn" -#: static/admin/js/SelectFilter2.js:69 +#: contrib/admin/static/admin/js/SelectFilter2.js:69 msgid "Remove" msgstr "Xóa" -#: static/admin/js/SelectFilter2.js:75 +#: contrib/admin/static/admin/js/SelectFilter2.js:75 #, c-format msgid "Chosen %s" msgstr "Chọn %s" -#: static/admin/js/SelectFilter2.js:76 +#: contrib/admin/static/admin/js/SelectFilter2.js:76 #, c-format msgid "" "This is the list of chosen %s. You may remove some by selecting them in the " @@ -74,21 +75,23 @@ "Danh sách bạn đã chọn %s. Bạn có thể bỏ chọn bằng cách click vào mũi tên " "\"Xoá\" nằm giữa hai ô." -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 msgid "Remove all" msgstr "Xoá tất cả" -#: static/admin/js/SelectFilter2.js:80 +#: contrib/admin/static/admin/js/SelectFilter2.js:80 #, c-format msgid "Click to remove all chosen %s at once." msgstr "Click để bỏ chọn tất cả %s" -#: static/admin/js/actions.js:18 static/admin/js/actions.min.js:1 +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 msgid "%(sel)s of %(cnt)s selected" msgid_plural "%(sel)s of %(cnt)s selected" msgstr[0] " %(sel)s của %(cnt)s được chọn" -#: static/admin/js/actions.js:109 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 msgid "" "You have unsaved changes on individual editable fields. If you run an " "action, your unsaved changes will be lost." @@ -96,7 +99,8 @@ "Bạn chưa lưu những trường đã chỉnh sửa. Nếu bạn chọn hành động này, những " "chỉnh sửa chưa được lưu sẽ bị mất." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -106,7 +110,8 @@ "lĩnh vực cá nhân được nêu ra. Xin vui lòng click OK để lưu lại. Bạn sẽ cần " "phải chạy lại các hành động." -#: static/admin/js/actions.js:123 static/admin/js/actions.min.js:6 +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 msgid "" "You have selected an action, and you haven't made any changes on individual " "fields. You're probably looking for the Go button rather than the Save " @@ -115,70 +120,87 @@ "Bạn đã lựa chọn một hành động, và bạn đã không thực hiện bất kỳ thay đổi nào " "trên các trường. Có lẽ bạn đang tìm kiếm nút bấm Go thay vì nút bấm Save." -#: static/admin/js/calendar.js:8 -msgid "" -"January February March April May June July August September October November " -"December" -msgstr "" -"Tháng một Tháng hai Tháng ba Tháng tư Tháng năm Tháng sáu Tháng bảy Tháng " -"tám Tháng chín Tháng mười Tháng mười một Tháng mười hai" - -#: static/admin/js/calendar.js:9 -msgid "S M T W T F S" -msgstr "S M T W T F S" - -#: static/admin/js/collapse.js:8 static/admin/js/collapse.js.c:19 -#: static/admin/js/collapse.min.js:1 -msgid "Show" -msgstr "Hiện ra" - -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 -msgid "Hide" -msgstr "Dấu đi" +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" +"Lưu ý: Hiện tại bạn đang thấy thời gian trước %s giờ so với thời gian máy " +"chủ." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" +"Lưu ý: Hiện tại bạn đang thấy thời gian sau %s giờ so với thời gian máy chủ." -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 msgid "Now" msgstr "Bây giờ" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 msgid "Clock" msgstr "Đồng hồ" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 msgid "Choose a time" msgstr "Chọn giờ" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 msgid "Midnight" msgstr "Nửa đêm" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 msgid "6 a.m." msgstr "6 giờ sáng" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 msgid "Noon" msgstr "Buổi trưa" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 msgid "Cancel" msgstr "Hủy bỏ" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 msgid "Today" msgstr "Hôm nay" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 msgid "Calendar" msgstr "Lịch" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 msgid "Yesterday" msgstr "Hôm qua" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 msgid "Tomorrow" msgstr "Ngày mai" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "" +"Tháng một Tháng hai Tháng ba Tháng tư Tháng năm Tháng sáu Tháng bảy Tháng " +"tám Tháng chín Tháng mười Tháng mười một Tháng mười hai" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "S M T W T F S" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "Hiện ra" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "Dấu đi" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/vi/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/vi/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/vi/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/vi/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/vi/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -3,17 +3,18 @@ # Translators: # Dimitris Glezos , 2012 # Jannis Leidel , 2011 -# Lê Thanh , 2013 +# Thanh Le Viet , 2013 # Tran , 2011 # Tran Van , 2011-2013 # Vuong Nguyen , 2011 +# xgenvn , 2014 msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-07 15:42+0000\n" +"Last-Translator: xgenvn \n" "Language-Team: Vietnamese (http://www.transifex.com/projects/p/django/" "language/vi/)\n" "MIME-Version: 1.0\n" @@ -22,62 +23,68 @@ "Language: vi\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: contrib/admin/actions.py:50 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "Đã xóa thành công %(count)d %(items)s ." -#: actions.py:61 options.py:1418 +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 #, python-format msgid "Cannot delete %(name)s" msgstr "Không thể xóa %(name)s" -#: actions.py:63 options.py:1420 +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 msgid "Are you sure?" msgstr "Bạn có chắc chắn không?" -#: actions.py:84 +#: contrib/admin/actions.py:84 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "Xóa các %(verbose_name_plural)s đã chọn" -#: filters.py:101 filters.py:197 filters.py:237 filters.py:274 filters.py:380 +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "Quản trị website" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 msgid "All" msgstr "Tất cả" -#: filters.py:238 +#: contrib/admin/filters.py:240 msgid "Yes" msgstr "Có" -#: filters.py:239 +#: contrib/admin/filters.py:241 msgid "No" msgstr "Không" -#: filters.py:253 +#: contrib/admin/filters.py:255 msgid "Unknown" msgstr "Chưa xác định" -#: filters.py:308 +#: contrib/admin/filters.py:315 msgid "Any date" msgstr "Bất kì ngày nào" -#: filters.py:309 +#: contrib/admin/filters.py:316 msgid "Today" msgstr "Hôm nay" -#: filters.py:313 +#: contrib/admin/filters.py:320 msgid "Past 7 days" msgstr "7 ngày trước" -#: filters.py:317 +#: contrib/admin/filters.py:324 msgid "This month" msgstr "Tháng này" -#: filters.py:321 +#: contrib/admin/filters.py:328 msgid "This year" msgstr "Năm nay" -#: forms.py:9 +#: contrib/admin/forms.py:14 #, python-format msgid "" "Please enter the correct %(username)s and password for a staff account. Note " @@ -85,94 +92,91 @@ msgstr "" "Bạn hãy nhập đúng %(username)s và mật khẩu. (Có phân biệt chữ hoa, thường)" -#: forms.py:19 -msgid "Please log in again, because your session has expired." -msgstr "Hãy đăng nhập lại vì giao dịch của bạn đã hết hiệu lực" - -#: helpers.py:23 +#: contrib/admin/helpers.py:23 msgid "Action:" msgstr "Hoạt động:" -#: models.py:25 +#: contrib/admin/models.py:25 msgid "action time" msgstr "Thời gian tác động" -#: models.py:28 +#: contrib/admin/models.py:28 msgid "object id" msgstr "Mã đối tượng" -#: models.py:29 +#: contrib/admin/models.py:29 msgid "object repr" msgstr "đối tượng repr" -#: models.py:30 +#: contrib/admin/models.py:30 msgid "action flag" msgstr "hiệu hành động" -#: models.py:31 +#: contrib/admin/models.py:31 msgid "change message" msgstr "thay đổi tin nhắn" -#: models.py:36 +#: contrib/admin/models.py:36 msgid "log entry" msgstr "đăng nhập" -#: models.py:37 +#: contrib/admin/models.py:37 msgid "log entries" msgstr "mục đăng nhập" -#: models.py:46 +#: contrib/admin/models.py:46 #, python-format msgid "Added \"%(object)s\"." msgstr "Thêm \"%(object)s\"." -#: models.py:48 +#: contrib/admin/models.py:48 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "Đã thay đổi \"%(object)s\" - %(changes)s" -#: models.py:53 +#: contrib/admin/models.py:53 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "Đối tượng \"%(object)s.\" đã được xoá." -#: models.py:55 +#: contrib/admin/models.py:55 msgid "LogEntry Object" msgstr "LogEntry Object" -#: options.py:173 options.py:202 +#: contrib/admin/options.py:230 contrib/admin/options.py:259 msgid "None" msgstr "Không" -#: options.py:763 +#: contrib/admin/options.py:956 #, python-format msgid "Changed %s." msgstr "%s đã được thay đổi." -#: options.py:763 options.py:773 options.py:1570 +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 msgid "and" msgstr "và" -#: options.py:768 +#: contrib/admin/options.py:961 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" đã được thêm vào." -#: options.py:772 +#: contrib/admin/options.py:965 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(list)s for %(name)s \"%(object)s\" đã được thay đổi." -#: options.py:777 +#: contrib/admin/options.py:970 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" đã bị xóa." -#: options.py:781 +#: contrib/admin/options.py:974 msgid "No fields changed." msgstr "Không có trường nào thay đổi" -#: options.py:884 options.py:927 +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." @@ -180,7 +184,7 @@ "%(name)s \"%(obj)s\" đã được thêm vào thành công. Bạn có thể sửa lại dưới " "đây." -#: options.py:902 +#: contrib/admin/options.py:1109 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -189,12 +193,12 @@ "Bạn đã thêm %(name)s \"%(obj)s\" thành công. Bạn có thể thêm các %(name)s " "khác dưới đây." -#: options.py:906 +#: contrib/admin/options.py:1116 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" được thêm vào thành công." -#: options.py:920 +#: contrib/admin/options.py:1131 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " @@ -203,7 +207,7 @@ "%(name)s \"%(obj)s\" đã được thay đổi thành công. Bạn có thể sửa lại dưới " "đây." -#: options.py:934 +#: contrib/admin/options.py:1148 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -212,12 +216,12 @@ "%(name)s \"%(obj)s\" đã thay đổi thành công. Bạn có thể thêm %(name)s khác " "dưới đây." -#: options.py:940 +#: contrib/admin/options.py:1157 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" đã được thay đổi thành công." -#: options.py:1018 options.py:1278 +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." @@ -225,149 +229,137 @@ "Mục tiêu phải được chọn mới có thể thực hiện hành động trên chúng. Không có " "mục tiêu nào đã được thay đổi." -#: options.py:1037 +#: contrib/admin/options.py:1259 msgid "No action selected." msgstr "Không có hoạt động nào được lựa chọn." -#: options.py:1117 +#: contrib/admin/options.py:1271 #, python-format -msgid "Add %s" -msgstr "Thêm %s" +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" đã được xóa thành công." -#: options.py:1141 options.py:1386 +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr " đối tượng %(name)s với khóa chính %(key)r không tồn tại." -#: options.py:1207 +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "Thêm %s" + +#: contrib/admin/options.py:1398 #, python-format msgid "Change %s" msgstr "Thay đổi %s" -#: options.py:1257 +#: contrib/admin/options.py:1460 msgid "Database error" msgstr "Cơ sở dữ liệu bị lỗi" -#: options.py:1320 +#: contrib/admin/options.py:1523 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] " %(count)s %(name)s đã được thay đổi thành công." -#: options.py:1347 +#: contrib/admin/options.py:1550 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "Tất cả %(total_count)s đã được chọn" -#: options.py:1352 +#: contrib/admin/options.py:1556 #, python-format msgid "0 of %(cnt)s selected" msgstr "0 của %(cnt)s được chọn" -#: options.py:1403 -#, python-format -msgid "The %(name)s \"%(obj)s\" was deleted successfully." -msgstr "%(name)s \"%(obj)s\" đã được xóa thành công." - -#: options.py:1459 +#: contrib/admin/options.py:1655 #, python-format msgid "Change history: %s" msgstr "Lịch sử thay đổi: %s" #. Translators: Model verbose name and instance representation, suitable to be #. an item in a list -#: options.py:1564 +#: contrib/admin/options.py:1802 #, python-format msgid "%(class_name)s %(instance)s" msgstr "%(class_name)s %(instance)s" -#: options.py:1571 +#: contrib/admin/options.py:1809 #, python-format msgid "" "Deleting %(class_name)s %(instance)s would require deleting the following " "protected related objects: %(related_objects)s" msgstr "" -"Xóa %(object_name)s '%(escaped_object)s', các đối tượng liên quan sau đây " -"cũng bị xóa theo:" +"Xóa %(class_name)s %(instance)s sẽ tự động xóa các đối tượng liên quan sau: " +"%(related_objects)s" -#: sites.py:318 tests.py:71 templates/admin/login.html:48 -#: templates/registration/password_reset_complete.html:19 -#: views/decorators.py:24 -msgid "Log in" -msgstr "Đăng nhập" +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Trang web admin Django" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Trang quản trị cho Django" -#: sites.py:386 +#: contrib/admin/sites.py:42 msgid "Site administration" msgstr "Site quản trị hệ thống." -#: sites.py:440 -#, python-format -msgid "%s administration" -msgstr "%s quản trị" - -#: widgets.py:90 -msgid "Date:" -msgstr "Ngày:" - -#: widgets.py:91 -msgid "Time:" -msgstr "Giờ:" - -#: widgets.py:165 -msgid "Lookup" -msgstr "Tìm" - -#: widgets.py:260 -msgid "Add Another" -msgstr "Thêm vào" - -#: widgets.py:302 -msgid "Currently:" -msgstr "Hiện nay:" +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "Đăng nhập" -#: widgets.py:303 -msgid "Change:" -msgstr "Thay đổi:" +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "Quản lý %(app)s" -#: templates/admin/404.html:4 templates/admin/404.html.py:8 +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Không tìm thấy trang nào" -#: templates/admin/404.html:10 +#: contrib/admin/templates/admin/404.html:10 msgid "We're sorry, but the requested page could not be found." msgstr "Xin lỗi bạn! Trang mà bạn yêu cầu không tìm thấy." -#: templates/admin/500.html:6 templates/admin/app_index.html:7 -#: templates/admin/base.html:47 templates/admin/change_form.html:19 -#: templates/admin/change_list.html:41 -#: templates/admin/delete_confirmation.html:7 -#: templates/admin/delete_selected_confirmation.html:7 -#: templates/admin/invalid_setup.html:6 templates/admin/object_history.html:7 -#: templates/admin/auth/user/change_password.html:13 -#: templates/registration/logged_out.html:4 -#: templates/registration/password_change_done.html:6 -#: templates/registration/password_change_form.html:7 -#: templates/registration/password_reset_complete.html:6 -#: templates/registration/password_reset_confirm.html:6 -#: templates/registration/password_reset_done.html:6 -#: templates/registration/password_reset_form.html:6 +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 msgid "Home" msgstr "Trang chủ" -#: templates/admin/500.html:7 +#: contrib/admin/templates/admin/500.html:7 msgid "Server error" msgstr "Lỗi máy chủ" -#: templates/admin/500.html:11 +#: contrib/admin/templates/admin/500.html:11 msgid "Server error (500)" msgstr "Lỗi máy chủ (500)" -#: templates/admin/500.html:14 +#: contrib/admin/templates/admin/500.html:14 msgid "Server Error (500)" msgstr "Lỗi máy chủ (500)" -#: templates/admin/500.html:15 +#: contrib/admin/templates/admin/500.html:15 msgid "" "There's been an error. It's been reported to the site administrators via " "email and should be fixed shortly. Thanks for your patience." @@ -375,120 +367,141 @@ "Có lỗi xảy ra. Lỗi sẽ được gửi đến quản trị website qua email và sẽ được " "khắc phục sớm. Cám ơn bạn." -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Run the selected action" msgstr "Bắt đầu hành động lựa chọn" -#: templates/admin/actions.html:4 +#: contrib/admin/templates/admin/actions.html:4 msgid "Go" msgstr "Đi đến" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 msgid "Click here to select the objects across all pages" msgstr "Click vào đây để lựa chọn các đối tượng trên tất cả các trang" -#: templates/admin/actions.html:11 +#: contrib/admin/templates/admin/actions.html:11 #, python-format msgid "Select all %(total_count)s %(module_name)s" msgstr "Hãy chọn tất cả %(total_count)s %(module_name)s" -#: templates/admin/actions.html:13 +#: contrib/admin/templates/admin/actions.html:13 msgid "Clear selection" msgstr "Xóa lựa chọn" -#: templates/admin/app_index.html:10 templates/admin/index.html:21 +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "" +"Đầu tiên, điền tên đăng nhập và mật khẩu. Sau đó bạn mới có thể chỉnh sửa " +"nhiều hơn lựa chọn của người dùng." + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "Điền tên đăng nhập và mật khẩu." + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "Thay đổi mật khẩu" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "Hãy sửa lỗi sai dưới đây" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "Hãy chỉnh sửa lại các lỗi sau." + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 #, python-format -msgid "%(name)s" -msgstr "%(name)s" +msgid "Enter a new password for the user %(username)s." +msgstr "Hãy nhập mật khẩu mới cho người sử dụng %(username)s." + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "Mật khẩu" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "Nhập lại mật khẩu" -#: templates/admin/base.html:28 +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "Nhập dãy mật mã trên để xác minh lại" + +#: contrib/admin/templates/admin/base.html:30 msgid "Welcome," msgstr "Chào mừng bạn," -#: templates/admin/base.html:33 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Documentation" msgstr "Tài liệu" -#: templates/admin/base.html:36 -#: templates/admin/auth/user/change_password.html:17 -#: templates/admin/auth/user/change_password.html:51 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 -msgid "Change password" -msgstr "Thay đổi mật khẩu" - -#: templates/admin/base.html:38 -#: templates/registration/password_change_done.html:3 -#: templates/registration/password_change_form.html:4 +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 msgid "Log out" msgstr "Thoát" -#: templates/admin/base_site.html:4 -msgid "Django site admin" -msgstr "Trang web admin Django" - -#: templates/admin/base_site.html:7 -msgid "Django administration" -msgstr "Trang quản trị cho Django" - -#: templates/admin/change_form.html:22 templates/admin/index.html:33 +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 msgid "Add" msgstr "Thêm vào" -#: templates/admin/change_form.html:32 templates/admin/object_history.html:11 +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 msgid "History" msgstr "Bản ghi nhớ" -#: templates/admin/change_form.html:33 -#: templates/admin/edit_inline/stacked.html:9 -#: templates/admin/edit_inline/tabular.html:30 +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 msgid "View on site" msgstr "Xem trên trang web" -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the error below." -msgstr "Hãy sửa lỗi sai dưới đây" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" - -#: templates/admin/change_list.html:58 +#: contrib/admin/templates/admin/change_list.html:58 #, python-format msgid "Add %(name)s" msgstr "Thêm vào %(name)s" -#: templates/admin/change_list.html:78 +#: contrib/admin/templates/admin/change_list.html:78 msgid "Filter" msgstr "Bộ lọc" -#: templates/admin/change_list_results.html:17 +#: contrib/admin/templates/admin/change_list_results.html:17 msgid "Remove from sorting" msgstr "Bỏ khỏi sắp xếp" -#: templates/admin/change_list_results.html:18 +#: contrib/admin/templates/admin/change_list_results.html:18 #, python-format msgid "Sorting priority: %(priority_number)s" msgstr "Sắp xếp theo:%(priority_number)s" -#: templates/admin/change_list_results.html:19 +#: contrib/admin/templates/admin/change_list_results.html:19 msgid "Toggle sorting" msgstr "Hoán đổi sắp xếp" -#: templates/admin/delete_confirmation.html:11 -#: templates/admin/submit_line.html:4 +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 msgid "Delete" msgstr "Xóa" -#: templates/admin/delete_confirmation.html:18 +#: contrib/admin/templates/admin/delete_confirmation.html:19 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " @@ -498,7 +511,7 @@ "Xóa %(object_name)s '%(escaped_object)s' sẽ làm mất những dữ liệu có liên " "quan. Tài khoản của bạn không được cấp quyển xóa những dữ liệu đi kèm theo." -#: templates/admin/delete_confirmation.html:26 +#: contrib/admin/templates/admin/delete_confirmation.html:27 #, python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " @@ -507,7 +520,7 @@ "Xóa các %(object_name)s ' %(escaped_object)s ' sẽ bắt buộc xóa các đối " "tượng được bảo vệ sau đây:" -#: templates/admin/delete_confirmation.html:34 +#: contrib/admin/templates/admin/delete_confirmation.html:35 #, python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " @@ -516,16 +529,16 @@ "Bạn có chắc là muốn xóa %(object_name)s \"%(escaped_object)s\"?Tất cả những " "dữ liệu đi kèm dưới đây cũng sẽ bị mất:" -#: templates/admin/delete_confirmation.html:39 -#: templates/admin/delete_selected_confirmation.html:44 +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 msgid "Yes, I'm sure" msgstr "Có, tôi chắc chắn." -#: templates/admin/delete_selected_confirmation.html:10 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 msgid "Delete multiple objects" msgstr "Xóa nhiều đối tượng" -#: templates/admin/delete_selected_confirmation.html:17 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 #, python-format msgid "" "Deleting the selected %(objects_name)s would result in deleting related " @@ -535,7 +548,7 @@ "Xóa các %(objects_name)s sẽ bắt buộc xóa các đối tượng liên quan, nhưng tài " "khoản của bạn không có quyền xóa các loại đối tượng sau đây:" -#: templates/admin/delete_selected_confirmation.html:25 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 #, python-format msgid "" "Deleting the selected %(objects_name)s would require deleting the following " @@ -544,7 +557,7 @@ "Xóa các %(objects_name)s sẽ bắt buộc xóa các đối tượng đã được bảo vệ sau " "đây:" -#: templates/admin/delete_selected_confirmation.html:33 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 #, python-format msgid "" "Are you sure you want to delete the selected %(objects_name)s? All of the " @@ -553,41 +566,56 @@ "Bạn chắc chắn muốn xóa những lựa chọn %(objects_name)s? Tất cả những đối " "tượng sau và những đối tượng liên quan sẽ được xóa:" -#: templates/admin/filter.html:2 +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "Gỡ bỏ" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "Thêm một %(verbose_name)s " + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "Bạn muốn xóa?" + +#: contrib/admin/templates/admin/filter.html:2 #, python-format msgid " By %(filter_title)s " msgstr "Bởi %(filter_title)s " -#: templates/admin/index.html:20 +#: contrib/admin/templates/admin/index.html:20 #, python-format msgid "Models in the %(name)s application" msgstr "Các mô models trong %(name)s" -#: templates/admin/index.html:39 +#: contrib/admin/templates/admin/index.html:37 msgid "Change" msgstr "Thay đổi" -#: templates/admin/index.html:49 +#: contrib/admin/templates/admin/index.html:47 msgid "You don't have permission to edit anything." msgstr "Bạn không được cấp quyền chỉnh sửa bất cứ cái gì." -#: templates/admin/index.html:57 +#: contrib/admin/templates/admin/index.html:55 msgid "Recent Actions" msgstr "Các hoạt động gần đây" -#: templates/admin/index.html:58 +#: contrib/admin/templates/admin/index.html:56 msgid "My Actions" msgstr "Hoạt động của tôi" -#: templates/admin/index.html:62 +#: contrib/admin/templates/admin/index.html:60 msgid "None available" msgstr "Không có sẵn" -#: templates/admin/index.html:76 +#: contrib/admin/templates/admin/index.html:74 msgid "Unknown content" msgstr "Không biết nội dung" -#: templates/admin/invalid_setup.html:12 +#: contrib/admin/templates/admin/invalid_setup.html:12 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " @@ -597,27 +625,27 @@ "liệu được tạo phù hợp và dữ liệu có thể được đọc bởi những người sử dụng phù " "hợp." -#: templates/admin/login.html:37 +#: contrib/admin/templates/admin/login.html:37 msgid "Password:" msgstr "Mật khẩu:" -#: templates/admin/login.html:44 +#: contrib/admin/templates/admin/login.html:43 msgid "Forgotten your password or username?" msgstr "Bạn quên mật khẩu hoặc tài khoản?" -#: templates/admin/object_history.html:23 +#: contrib/admin/templates/admin/object_history.html:22 msgid "Date/time" msgstr "Ngày/giờ" -#: templates/admin/object_history.html:24 +#: contrib/admin/templates/admin/object_history.html:23 msgid "User" msgstr "Người dùng" -#: templates/admin/object_history.html:25 +#: contrib/admin/templates/admin/object_history.html:24 msgid "Action" msgstr "Hành động" -#: templates/admin/object_history.html:39 +#: contrib/admin/templates/admin/object_history.html:38 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." @@ -625,111 +653,60 @@ "Đối tượng này không có một lịch sử thay đổi. Nó có lẽ đã không được thêm vào " "qua trang web admin." -#: templates/admin/pagination.html:10 +#: contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Hiện tất cả" -#: templates/admin/pagination.html:11 templates/admin/submit_line.html:3 +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 msgid "Save" msgstr "Lưu lại" -#: templates/admin/search_form.html:7 +#: contrib/admin/templates/admin/search_form.html:7 msgid "Search" msgstr "Tìm kiếm" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(counter)s result" msgid_plural "%(counter)s results" msgstr[0] "%(counter)s kết quả" -#: templates/admin/search_form.html:9 +#: contrib/admin/templates/admin/search_form.html:9 #, python-format msgid "%(full_result_count)s total" msgstr "tổng số %(full_result_count)s" -#: templates/admin/submit_line.html:5 +#: contrib/admin/templates/admin/submit_line.html:8 msgid "Save as new" msgstr "Lưu mới" -#: templates/admin/submit_line.html:6 +#: contrib/admin/templates/admin/submit_line.html:9 msgid "Save and add another" msgstr "Lưu và thêm mới" -#: templates/admin/submit_line.html:7 +#: contrib/admin/templates/admin/submit_line.html:10 msgid "Save and continue editing" msgstr "Lưu và tiếp tục chỉnh sửa" -#: templates/admin/auth/user/add_form.html:6 -msgid "" -"First, enter a username and password. Then, you'll be able to edit more user " -"options." -msgstr "" -"Đầu tiên, điền tên đăng nhập và mật khẩu. Sau đó bạn mới có thể chỉnh sửa " -"nhiều hơn lựa chọn của người dùng." - -#: templates/admin/auth/user/add_form.html:8 -msgid "Enter a username and password." -msgstr "Điền tên đăng nhập và mật khẩu." - -#: templates/admin/auth/user/change_password.html:31 -#, python-format -msgid "Enter a new password for the user %(username)s." -msgstr "Hãy nhập mật khẩu mới cho người sử dụng %(username)s." - -#: templates/admin/auth/user/change_password.html:38 -msgid "Password" -msgstr "Mật khẩu" - -#: templates/admin/auth/user/change_password.html:44 -#: templates/registration/password_change_form.html:42 -msgid "Password (again)" -msgstr "Nhập lại mật khẩu" - -#: templates/admin/auth/user/change_password.html:45 -msgid "Enter the same password as above, for verification." -msgstr "Nhập dãy mật mã trên để xác minh lại" - -#: templates/admin/edit_inline/stacked.html:26 -#: templates/admin/edit_inline/tabular.html:76 -msgid "Remove" -msgstr "Gỡ bỏ" - -#: templates/admin/edit_inline/stacked.html:27 -#: templates/admin/edit_inline/tabular.html:75 -#, python-format -msgid "Add another %(verbose_name)s" -msgstr "Thêm một %(verbose_name)s " - -#: templates/admin/edit_inline/tabular.html:17 -msgid "Delete?" -msgstr "Bạn muốn xóa?" - -#: templates/registration/logged_out.html:8 +#: contrib/admin/templates/registration/logged_out.html:8 msgid "Thanks for spending some quality time with the Web site today." msgstr "Cảm ơn bạn đã dành thời gian với website này" -#: templates/registration/logged_out.html:10 +#: contrib/admin/templates/registration/logged_out.html:10 msgid "Log in again" msgstr "Đăng nhập lại" -#: templates/registration/password_change_done.html:7 -#: templates/registration/password_change_form.html:8 -#: templates/registration/password_change_form.html:12 -#: templates/registration/password_change_form.html:24 +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 msgid "Password change" msgstr "Thay đổi mật khẩu" -#: templates/registration/password_change_done.html:11 -#: templates/registration/password_change_done.html:15 -msgid "Password change successful" -msgstr "Mật khẩu được thay đổi thành công" - -#: templates/registration/password_change_done.html:17 +#: contrib/admin/templates/registration/password_change_done.html:14 msgid "Your password was changed." msgstr "Mật khẩu của bạn đã được thay đổi" -#: templates/registration/password_change_form.html:26 +#: contrib/admin/templates/registration/password_change_form.html:26 msgid "" "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." @@ -737,46 +714,34 @@ "Hãy nhập lại mật khẩu cũ và sau đó nhập mật khẩu mới hai lần để chúng tôi có " "thể kiểm tra lại xem bạn đã gõ chính xác hay chưa." -#: templates/registration/password_change_form.html:32 +#: contrib/admin/templates/registration/password_change_form.html:32 msgid "Old password" msgstr "Mật khẩu cũ" -#: templates/registration/password_change_form.html:37 +#: contrib/admin/templates/registration/password_change_form.html:37 msgid "New password" msgstr "Mật khẩu mới" -#: templates/registration/password_change_form.html:48 -#: templates/registration/password_reset_confirm.html:26 +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 msgid "Change my password" msgstr "Thay đổi mật khẩu" -#: templates/registration/password_reset_complete.html:7 -#: templates/registration/password_reset_confirm.html:11 -#: templates/registration/password_reset_done.html:7 -#: templates/registration/password_reset_form.html:7 -#: templates/registration/password_reset_form.html:11 -#: templates/registration/password_reset_form.html:15 +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 msgid "Password reset" msgstr "Lập lại mật khẩu" -#: templates/registration/password_reset_complete.html:11 -#: templates/registration/password_reset_complete.html:15 -msgid "Password reset complete" -msgstr "Hoàn thành việc lập lại mật khẩu" - -#: templates/registration/password_reset_complete.html:17 +#: contrib/admin/templates/registration/password_reset_complete.html:16 msgid "Your password has been set. You may go ahead and log in now." msgstr "Mật khẩu của bạn đã được lập lại. Bạn hãy thử đăng nhập." -#: templates/registration/password_reset_confirm.html:7 +#: contrib/admin/templates/registration/password_reset_confirm.html:7 msgid "Password reset confirmation" msgstr "Xác nhận việc lập lại mật khẩu" -#: templates/registration/password_reset_confirm.html:17 -msgid "Enter new password" -msgstr "Nhập mật khẩu mới" - -#: templates/registration/password_reset_confirm.html:19 +#: contrib/admin/templates/registration/password_reset_confirm.html:17 msgid "" "Please enter your new password twice so we can verify you typed it in " "correctly." @@ -784,19 +749,15 @@ "Hãy nhập mật khẩu mới hai lần để chúng tôi có thể kiểm tra xem bạn đã gõ " "chính xác chưa" -#: templates/registration/password_reset_confirm.html:23 +#: contrib/admin/templates/registration/password_reset_confirm.html:21 msgid "New password:" msgstr "Mật khẩu mới" -#: templates/registration/password_reset_confirm.html:25 +#: contrib/admin/templates/registration/password_reset_confirm.html:23 msgid "Confirm password:" msgstr "Nhập lại mật khẩu:" -#: templates/registration/password_reset_confirm.html:31 -msgid "Password reset unsuccessful" -msgstr "Lập lại mật khẩu không thành công" - -#: templates/registration/password_reset_confirm.html:33 +#: contrib/admin/templates/registration/password_reset_confirm.html:29 msgid "" "The password reset link was invalid, possibly because it has already been " "used. Please request a new password reset." @@ -804,12 +765,7 @@ "Liên kết đặt lại mật khẩu không hợp lệ, có thể vì nó đã được sử dụng. Xin " "vui lòng yêu cầu đặt lại mật khẩu mới." -#: templates/registration/password_reset_done.html:11 -#: templates/registration/password_reset_done.html:15 -msgid "Password reset successful" -msgstr "Lấy lại mật khẩu thành công" - -#: templates/registration/password_reset_done.html:17 +#: contrib/admin/templates/registration/password_reset_done.html:15 msgid "" "We've emailed you instructions for setting your password. You should be " "receiving them shortly." @@ -817,7 +773,7 @@ "Chúng tôi vừa email cho bạn hướng dẫn thiết lập mật khẩu. Hãy mở email để " "kiểm tra." -#: templates/registration/password_reset_done.html:19 +#: contrib/admin/templates/registration/password_reset_done.html:17 msgid "" "If you don't receive an email, please make sure you've entered the address " "you registered with, and check your spam folder." @@ -825,7 +781,7 @@ "Nếu bạn không nhận được email, hãy kiểm tra lại địa chỉ email mà bạn dùng để " "đăng kí hoặc kiểm tra trong thư mục spam/rác" -#: templates/registration/password_reset_email.html:2 +#: contrib/admin/templates/registration/password_reset_email.html:2 #, python-format msgid "" "You're receiving this email because you requested a password reset for your " @@ -834,24 +790,24 @@ "Bạn nhận được email này vì bạn đã yêu cầu làm mới lại mật khẩu cho tài khoản " "của bạn tại %(site_name)s." -#: templates/registration/password_reset_email.html:4 +#: contrib/admin/templates/registration/password_reset_email.html:4 msgid "Please go to the following page and choose a new password:" msgstr "Hãy vào đường link dưới đây và chọn một mật khẩu mới" -#: templates/registration/password_reset_email.html:8 +#: contrib/admin/templates/registration/password_reset_email.html:8 msgid "Your username, in case you've forgotten:" msgstr "Tên đăng nhập của bạn, trường hợp bạn quên nó:" -#: templates/registration/password_reset_email.html:10 +#: contrib/admin/templates/registration/password_reset_email.html:10 msgid "Thanks for using our site!" msgstr "Cảm ơn bạn đã sử dụng website của chúng tôi!" -#: templates/registration/password_reset_email.html:12 +#: contrib/admin/templates/registration/password_reset_email.html:12 #, python-format msgid "The %(site_name)s team" msgstr "Đội của %(site_name)s" -#: templates/registration/password_reset_form.html:17 +#: contrib/admin/templates/registration/password_reset_form.html:15 msgid "" "Forgotten your password? Enter your email address below, and we'll email " "instructions for setting a new one." @@ -859,28 +815,52 @@ "Quên mật khẩu? Nhập địa chỉ email vào ô dưới đây. Chúng tôi sẽ email cho bạn " "hướng dẫn cách thiết lập mật khẩu mới." -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Email address:" msgstr "Địa chỉ Email:" -#: templates/registration/password_reset_form.html:21 +#: contrib/admin/templates/registration/password_reset_form.html:19 msgid "Reset my password" msgstr "Làm lại mật khẩu" -#: templatetags/admin_list.py:348 +#: contrib/admin/templatetags/admin_list.py:379 msgid "All dates" msgstr "Tất cả các ngày" -#: views/main.py:35 +#: contrib/admin/views/main.py:34 msgid "(None)" msgstr "(Không)" -#: views/main.py:84 +#: contrib/admin/views/main.py:107 #, python-format msgid "Select %s" msgstr "Chọn %s" -#: views/main.py:86 +#: contrib/admin/views/main.py:109 #, python-format msgid "Select %s to change" msgstr "Chọn %s để thay đổi" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "Ngày:" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "Giờ:" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "Tìm" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "Thêm vào" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "Hiện nay:" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "Thay đổi:" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_CN/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,18 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Jannis Leidel , 2011 -# Lele Long , 2011 -# slene , 2011 -# Ziang Song , 2012 -# Kevin Shi , 2012 +# Jannis Leidel , 2011. +# Kevin Shi , 2012. +# Lele Long , 2011. +# slene , 2011. +# Ziang Song , 2012. msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2012-03-23 02:35+0100\n" +"PO-Revision-Date: 2012-07-20 01:51+0000\n" +"Last-Translator: 磊 施 \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -94,7 +94,7 @@ msgstr "" "你尚未保存一个可编辑栏位的变更. 如果你进行别的动作, 未保存的变更将会丢失." -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -112,13 +112,13 @@ "你已选则执行一个动作, 但可编辑栏位沒有任何改变. 你应该尝试 '去' 按钮, 而不是 " "'保存' 按钮." -#: static/admin/js/calendar.js:8 +#: static/admin/js/calendar.js:26 msgid "" "January February March April May June July August September October November " "December" msgstr "一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月" -#: static/admin/js/calendar.js:9 +#: static/admin/js/calendar.js:27 msgid "S M T W T F S" msgstr "日 一 二 三 四 五 六" @@ -127,53 +127,53 @@ msgid "Show" msgstr "显示" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 +#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1 msgid "Hide" msgstr "隐藏" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: static/admin/js/admin/DateTimeShortcuts.js:49 +#: static/admin/js/admin/DateTimeShortcuts.js:85 msgid "Now" msgstr "现在" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: static/admin/js/admin/DateTimeShortcuts.js:53 msgid "Clock" msgstr "时钟" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: static/admin/js/admin/DateTimeShortcuts.js:81 msgid "Choose a time" msgstr "选择一个时间" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: static/admin/js/admin/DateTimeShortcuts.js:86 msgid "Midnight" msgstr "午夜" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: static/admin/js/admin/DateTimeShortcuts.js:87 msgid "6 a.m." msgstr "上午6点" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: static/admin/js/admin/DateTimeShortcuts.js:88 msgid "Noon" msgstr "正午" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: static/admin/js/admin/DateTimeShortcuts.js:92 +#: static/admin/js/admin/DateTimeShortcuts.js:204 msgid "Cancel" msgstr "取消" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: static/admin/js/admin/DateTimeShortcuts.js:144 +#: static/admin/js/admin/DateTimeShortcuts.js:197 msgid "Today" msgstr "今天" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: static/admin/js/admin/DateTimeShortcuts.js:148 msgid "Calendar" msgstr "日历" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: static/admin/js/admin/DateTimeShortcuts.js:195 msgid "Yesterday" msgstr "昨天" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: static/admin/js/admin/DateTimeShortcuts.js:199 msgid "Tomorrow" msgstr "明天" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_CN/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,20 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# Jannis Leidel , 2011 -# Lele Long , 2011 -# 鸿宇 欧阳 , 2013 -# seansay , 2013 -# slene , 2011 -# Ziang Song , 2012 -# Kevin Shi , 2012 +# Jannis Leidel , 2011. +# Lele Long , 2011. +# slene , 2011. +# Ziang Song , 2012. +# 磊 施 , 2012. msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2013-01-01 16:10+0100\n" +"PO-Revision-Date: 2013-01-02 08:52+0000\n" +"Last-Translator: 磊 施 \n" "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" "language/zh_CN/)\n" "MIME-Version: 1.0\n" @@ -23,21 +21,21 @@ "Language: zh_CN\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: actions.py:48 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "成功删除了 %(count)d 个 %(items)s" -#: actions.py:61 options.py:1418 +#: actions.py:60 options.py:1347 #, python-format msgid "Cannot delete %(name)s" msgstr "无法删除 %(name)s" -#: actions.py:63 options.py:1420 +#: actions.py:62 options.py:1349 msgid "Are you sure?" msgstr "你确定吗？" -#: actions.py:84 +#: actions.py:83 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "删除所选的 %(verbose_name_plural)s" @@ -83,7 +81,7 @@ msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." -msgstr "请输入一个正确的 %(username)s 和密码. 注意他们都是区分大小写的." +msgstr "" #: forms.py:19 msgid "Please log in again, because your session has expired." @@ -93,92 +91,92 @@ msgid "Action:" msgstr "动作" -#: models.py:25 +#: models.py:24 msgid "action time" msgstr "动作时间" -#: models.py:28 +#: models.py:27 msgid "object id" msgstr "对象id" -#: models.py:29 +#: models.py:28 msgid "object repr" msgstr "对象表示" -#: models.py:30 +#: models.py:29 msgid "action flag" msgstr "动作标志" -#: models.py:31 +#: models.py:30 msgid "change message" msgstr "修改消息" -#: models.py:36 +#: models.py:35 msgid "log entry" msgstr "日志记录" -#: models.py:37 +#: models.py:36 msgid "log entries" msgstr "日志记录" -#: models.py:46 +#: models.py:45 #, python-format msgid "Added \"%(object)s\"." msgstr "已经添加了 \"%(object)s\"." -#: models.py:48 +#: models.py:47 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "修改了 \"%(object)s\" - %(changes)s" -#: models.py:53 +#: models.py:52 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "删除了 \"%(object)s.\"" -#: models.py:55 +#: models.py:54 msgid "LogEntry Object" msgstr "LogEntry对象" -#: options.py:173 options.py:202 +#: options.py:156 options.py:172 msgid "None" msgstr "无" -#: options.py:763 +#: options.py:684 #, python-format msgid "Changed %s." msgstr "已修改 %s 。" -#: options.py:763 options.py:773 options.py:1570 +#: options.py:684 options.py:694 msgid "and" msgstr "和" -#: options.py:768 +#: options.py:689 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "已添加 %(name)s \"%(object)s\"." -#: options.py:772 +#: options.py:693 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "已变更 %(list)s for %(name)s \"%(object)s\"." -#: options.py:777 +#: options.py:698 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "已删除 %(name)s \"%(object)s\"." -#: options.py:781 +#: options.py:702 msgid "No fields changed." msgstr "没有字段被修改。" -#: options.py:884 options.py:927 +#: options.py:807 options.py:860 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。" -#: options.py:902 +#: options.py:835 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " @@ -186,19 +184,19 @@ msgstr "" " %(name)s \"%(obj)s\" 已经成功添加。你可以在下面添加另外的 %(name)s 。" -#: options.py:906 +#: options.py:839 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 添加成功。" -#: options.py:920 +#: options.py:853 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr " %(name)s \"%(obj)s\" 已经成功进行变更。你可以在下面再次编辑它。" -#: options.py:934 +#: options.py:867 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " @@ -206,89 +204,74 @@ msgstr "" " %(name)s \"%(obj)s\" 已经成功进行变更。你可以在下面添加其它的 %(name)s。" -#: options.py:940 +#: options.py:873 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 修改成功。" -#: options.py:1018 options.py:1278 +#: options.py:951 options.py:1211 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "条目必须选中以对其进行操作。没有任何条目被更改。" -#: options.py:1037 +#: options.py:970 msgid "No action selected." msgstr "未选择动作" -#: options.py:1117 +#: options.py:1050 #, python-format msgid "Add %s" msgstr "增加 %s" -#: options.py:1141 options.py:1386 +#: options.py:1074 options.py:1319 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。" -#: options.py:1207 +#: options.py:1140 #, python-format msgid "Change %s" msgstr "修改 %s" -#: options.py:1257 +#: options.py:1190 msgid "Database error" msgstr "数据库错误" -#: options.py:1320 +#: options.py:1253 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "总共 %(count)s 个 %(name)s 变更成功。" -#: options.py:1347 +#: options.py:1280 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "选中了 %(total_count)s 个" -#: options.py:1352 +#: options.py:1285 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s 个中 0 个被选" -#: options.py:1403 +#: options.py:1335 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 删除成功。" -#: options.py:1459 +#: options.py:1382 #, python-format msgid "Change history: %s" msgstr "变更历史： %s" -#. Translators: Model verbose name and instance representation, suitable to be -#. an item in a list -#: options.py:1564 -#, python-format -msgid "%(class_name)s %(instance)s" -msgstr "%(class_name)s %(instance)s" - -#: options.py:1571 -#, python-format -msgid "" -"Deleting %(class_name)s %(instance)s would require deleting the following " -"protected related objects: %(related_objects)s" -msgstr "" -"删除 %(object_name)s '%(escaped_object)s' 将需要删除以下受保护的相关对象:" - -#: sites.py:318 tests.py:71 templates/admin/login.html:48 +#: sites.py:322 tests.py:57 templates/admin/login.html:48 #: templates/registration/password_reset_complete.html:19 #: views/decorators.py:24 msgid "Log in" msgstr "登录" -#: sites.py:386 +#: sites.py:388 msgid "Site administration" msgstr "站点管理" @@ -309,15 +292,15 @@ msgid "Lookup" msgstr "查询" -#: widgets.py:260 +#: widgets.py:271 msgid "Add Another" msgstr "添加另一个" -#: widgets.py:302 +#: widgets.py:316 msgid "Currently:" msgstr "当前：" -#: widgets.py:303 +#: widgets.py:317 msgid "Change:" msgstr "更改：" @@ -443,14 +426,8 @@ #: templates/admin/auth/user/change_password.html:27 #: templates/registration/password_change_form.html:20 msgid "Please correct the error below." -msgstr "请修正下面的错误。" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" +msgid_plural "Please correct the errors below." +msgstr[0] "请修正下面的错误。" #: templates/admin/change_list.html:58 #, python-format @@ -790,17 +767,11 @@ #: templates/registration/password_reset_done.html:17 msgid "" -"We've emailed you instructions for setting your password. You should be " -"receiving them shortly." -msgstr "" -"我们将把设置你提供的email地址的密码的指南发到你的邮箱。 你很快将会收到。" - -#: templates/registration/password_reset_done.html:19 -msgid "" -"If you don't receive an email, please make sure you've entered the address " -"you registered with, and check your spam folder." +"We've emailed you instructions for setting your password to the email " +"address you submitted. You should be receiving it shortly." msgstr "" -"如果你没有收到邮件, 请确保您所输入的地址是正确的, 并检查您的垃圾邮件文件夹." +"我们已经使用你提供的电子邮件地址发送了电子邮件，以便你设置密码。不久之后你应" +"当可以收到这封邮件。" #: templates/registration/password_reset_email.html:2 #, python-format @@ -842,20 +813,20 @@ msgid "Reset my password" msgstr "重设我的密码" -#: templatetags/admin_list.py:348 +#: templatetags/admin_list.py:344 msgid "All dates" msgstr "所有日期" -#: views/main.py:35 +#: views/main.py:33 msgid "(None)" msgstr "(None)" -#: views/main.py:84 +#: views/main.py:76 #, python-format msgid "Select %s" msgstr "选择 %s" -#: views/main.py:86 +#: views/main.py:78 #, python-format msgid "Select %s to change" msgstr "选择 %s 来修改" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -0,0 +1,197 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Jannis Leidel , 2011 +# Lele Long , 2011 +# slene , 2011 +# Ziang Song , 2012 +# Kevin Sze , 2012 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" +"language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "可用 %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" +"这是可用的%s列表。你可以在选择框下面进行选择，然后点击两选框之间的“选择”箭" +"头。" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "在此框中键入以过滤可用的%s列表" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "过滤" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "全选" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "点击选择全部%s。" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "选择" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "删除" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "选中的 %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "这是已选%s的列表。你可以" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "删除全部" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "删除所有选择的%s。" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "选中了 %(cnt)s 个中的 %(sel)s 个" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "" +"你尚未保存一个可编辑栏位的变更. 如果你进行别的动作, 未保存的变更将会丢失." + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" +"你已选则执行一个动作, 但有一个可编辑栏位的变更尚未保存. 请点选确定进行保存. " +"再重新执行该动作." + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" +"你已选则执行一个动作, 但可编辑栏位沒有任何改变. 你应该尝试 '去' 按钮, 而不是 " +"'保存' 按钮." + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "现在" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "时钟" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "选择一个时间" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "午夜" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "上午6点" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "正午" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "取消" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "今天" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "日历" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "昨天" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "明天" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "日 一 二 三 四 五 六" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "显示" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "隐藏" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_Hans/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -0,0 +1,844 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# Jannis Leidel , 2011 +# Kevin Sze , 2012 +# Lele Long , 2011 +# ouyanghongyu , 2013-2014 +# Sean Lee , 2013 +# Sean Lee , 2013 +# slene , 2011 +# Ziang Song , 2012 +# Kevin Sze , 2012 +# ouyanghongyu , 2013 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-09-04 10:34+0000\n" +"Last-Translator: ouyanghongyu \n" +"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" +"language/zh_CN/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_CN\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "成功删除了 %(count)d 个 %(items)s" + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "无法删除 %(name)s" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "你确定吗？" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "删除所选的 %(verbose_name_plural)s" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "管理" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "全部" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "是" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "否" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "未知" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "任意日期" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "今天" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "过去7天" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "本月" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "今年" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "请输入一个正确的 %(username)s 和密码. 注意他们都是区分大小写的." + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "动作" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "动作时间" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "对象id" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "对象表示" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "动作标志" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "修改消息" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "日志记录" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "日志记录" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "已经添加了 \"%(object)s\"." + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "修改了 \"%(object)s\" - %(changes)s" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "删除了 \"%(object)s.\"" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "LogEntry对象" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "无" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "已修改 %s 。" + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "和" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "已添加 %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "已变更 %(list)s for %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "已删除 %(name)s \"%(object)s\"." + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "没有字段被修改。" + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "%(name)s \"%(obj)s\" 添加成功。你可以在下面再次编辑它。" + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "" +" %(name)s \"%(obj)s\" 已经成功添加。你可以在下面添加另外的 %(name)s 。" + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "%(name)s \"%(obj)s\" 添加成功。" + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr " %(name)s \"%(obj)s\" 已经成功进行变更。你可以在下面再次编辑它。" + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "" +" %(name)s \"%(obj)s\" 已经成功进行变更。你可以在下面添加其它的 %(name)s。" + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "%(name)s \"%(obj)s\" 修改成功。" + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "条目必须选中以对其进行操作。没有任何条目被更改。" + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "未选择动作" + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" 删除成功。" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "具有主键 %(key)r 的对象 %(name)s 不存在。" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "增加 %s" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "修改 %s" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "数据库错误" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "总共 %(count)s 个 %(name)s 变更成功。" + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "选中了 %(total_count)s 个" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "%(cnt)s 个中 0 个被选" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "变更历史： %s" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "%(class_name)s %(instance)s" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" +"删除 %(class_name)s %(instance)s 将需要删除以下受保护的相关对象: " +"%(related_objects)s" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django 站点管理员" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django 管理" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "站点管理" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "登录" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "页面没有找到" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "很报歉，请求页面无法找到。" + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "首页" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "服务器错误" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "服务器错误(500)" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "服务器错误 (500)" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" +"有一个错误。已经通过电子邮件通知网站管理员，不久以后应该可以修复。谢谢你的参" +"与。" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "运行选中的动作" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "执行" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "点击此处选择所有页面中包含的对象。" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "选中所有的 %(total_count)s 个 %(module_name)s" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "清除选中" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "首先，输入一个用户名和密码。然后，你就可以编辑更多的用户选项。" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "输入用户名和" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "修改密码" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "请修正下面的错误。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "请更正下列错误。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "为用户 %(username)s 输入一个新的密码。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "密码" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "密码(重复)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "为了校验，输入与上面相同的密码。" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "欢迎，" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "文档" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "注销" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "增加" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "历史" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "在站点上查看" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "增加 %(name)s" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "过滤器" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "删除排序" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "排序优先级: %(priority_number)s" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "正逆序切换" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "删除" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"删除 %(object_name)s '%(escaped_object)s' 会导致删除相关的对象，但你的帐号无" +"权删除下列类型的对象：" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"要删除 %(object_name)s '%(escaped_object)s', 将要求删除以下受保护的相关对象:" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"你确认想要删除 %(object_name)s \"%(escaped_object)s\"？ 下列所有相关的项目都" +"将被删除：" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "是的，我确定" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "删除多个对象" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"要删除所选的 %(objects_name)s 结果会删除相关对象, 但你的账户没有权限删除这类" +"对象:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "要删除所选的 %(objects_name)s, 将要求删除以下受保护的相关对象:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" +"请确认要删除选中的 %(objects_name)s 吗？以下所有对象和余它们相关的条目将都会" +"被删除：" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "删除" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "添加另一个 %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "删除？" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr " 以 %(filter_title)s" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "在应用程序 %(name)s 中的模型" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "修改" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "你无权修改任何东西。" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "最近动作" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "我的动作" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "无可用的" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "未知内容" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"你的数据库安装有误。确保已经创建了相应的数据库表，并确保数据库可被相关的用户" +"读取。" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "密码：" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "忘记了您的密码或用户名？" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "日期/时间" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "用户" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "动作" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "该对象没有变更历史记录。可能从未通过这个管理站点添加。" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "显示全部" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "保存" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "搜索" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "%(counter)s 条结果。" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "总共 %(full_result_count)s" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "保存为新的" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "保存并增加另一个" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "保存并继续编辑" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "感谢您今天在本站花费了一些宝贵时间。" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "重新登录" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "密码修改" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "你的密码已修改。" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"请输入你的旧密码，为了安全起见，接着要输入两遍新密码，以便我们校验你输入的是" +"否正确。" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "旧密码" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "新密码" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "修改我的密码" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "密码重设" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "你的口令己经设置。现在你可以继续进行登录。" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "密码重设确认" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "请输入两遍新密码，以便我们校验你输入的是否正确。" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "新密码：" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "确认密码：" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "密码重置链接无效，可能是因为它已使用。可以请求一次新的密码重置。" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" +"我们将把设置你提供的email地址的密码的指南发到你的邮箱。 你很快将会收到。" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" +"如果你没有收到邮件, 请确保您所输入的地址是正确的, 并检查您的垃圾邮件文件夹." + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "你收到这封邮件是因为你请求重置你在网站 %(site_name)s上的用户账户密码。" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "请访问该页面并选择一个新密码：" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "你的用户名，如果已忘记的话：" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "感谢使用我们的站点！" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "%(site_name)s 团队" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" +"忘记你的密码了？在下面输入你的电子邮件地址，我们将发送一封设置新密码的邮件给" +"你。" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "电子邮件地址：" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "重设我的密码" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "所有日期" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "(None)" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "选择 %s" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "选择 %s 来修改" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "日期：" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "时间：" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "查询" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "添加另一个" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "当前：" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "更改：" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/djangojs.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -0,0 +1,196 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# ilay , 2012 +# mail6543210 , 2013 +# tcc , 2011 +# Yeh-Yung , 2012 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-05-20 09:41+0000\n" +"Last-Translator: Jannis Leidel \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" +"language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: contrib/admin/static/admin/js/SelectFilter2.js:45 +#, c-format +msgid "Available %s" +msgstr "可用 %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:46 +#, c-format +msgid "" +"This is the list of available %s. You may choose some by selecting them in " +"the box below and then clicking the \"Choose\" arrow between the two boxes." +msgstr "" +"可用的 %s 列表。你可以在下方的方框內選擇後，點擊兩個方框中的\"選取\"箭頭以選" +"取。" + +#: contrib/admin/static/admin/js/SelectFilter2.js:53 +#, c-format +msgid "Type into this box to filter down the list of available %s." +msgstr "輸入到這個方框以過濾可用的 %s 列表。" + +#: contrib/admin/static/admin/js/SelectFilter2.js:57 +msgid "Filter" +msgstr "過濾器" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +msgid "Choose all" +msgstr "全選" + +#: contrib/admin/static/admin/js/SelectFilter2.js:61 +#, c-format +msgid "Click to choose all %s at once." +msgstr "點擊以一次選取所有的 %s" + +#: contrib/admin/static/admin/js/SelectFilter2.js:67 +msgid "Choose" +msgstr "選取" + +#: contrib/admin/static/admin/js/SelectFilter2.js:69 +msgid "Remove" +msgstr "移除" + +#: contrib/admin/static/admin/js/SelectFilter2.js:75 +#, c-format +msgid "Chosen %s" +msgstr "%s 被選" + +#: contrib/admin/static/admin/js/SelectFilter2.js:76 +#, c-format +msgid "" +"This is the list of chosen %s. You may remove some by selecting them in the " +"box below and then clicking the \"Remove\" arrow between the two boxes." +msgstr "" +"選取的 %s 列表。你可以在下方的方框內選擇後，點擊兩個方框中的\"移除\"箭頭以移" +"除。" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +msgid "Remove all" +msgstr "全部移除" + +#: contrib/admin/static/admin/js/SelectFilter2.js:80 +#, c-format +msgid "Click to remove all chosen %s at once." +msgstr "點擊以一次移除所有選取的 %s" + +#: contrib/admin/static/admin/js/actions.js:22 +#: contrib/admin/static/admin/js/actions.min.js:1 +msgid "%(sel)s of %(cnt)s selected" +msgid_plural "%(sel)s of %(cnt)s selected" +msgstr[0] "%(cnt)s 中 %(sel)s 個被選" + +#: contrib/admin/static/admin/js/actions.js:114 +#: contrib/admin/static/admin/js/actions.min.js:4 +msgid "" +"You have unsaved changes on individual editable fields. If you run an " +"action, your unsaved changes will be lost." +msgstr "你尚未儲存一個可編輯欄位的變更。如果你執行動作, 未儲存的變更將會遺失。" + +#: contrib/admin/static/admin/js/actions.js:126 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, but you haven't saved your changes to " +"individual fields yet. Please click OK to save. You'll need to re-run the " +"action." +msgstr "" +"你已選了一個動作, 但有一個可編輯欄位的變更尚未儲存。請點選 OK 進行儲存。你需" +"要重新執行該動作。" + +#: contrib/admin/static/admin/js/actions.js:128 +#: contrib/admin/static/admin/js/actions.min.js:5 +msgid "" +"You have selected an action, and you haven't made any changes on individual " +"fields. You're probably looking for the Go button rather than the Save " +"button." +msgstr "" +"你已選了一個動作, 但沒有任何改變。你可能動到 '去' 按鈕, 而不是 '儲存' 按鈕。" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:79 +#, c-format +msgid "Note: You are %s hour ahead of server time." +msgid_plural "Note: You are %s hours ahead of server time." +msgstr[0] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:87 +#, c-format +msgid "Note: You are %s hour behind server time." +msgid_plural "Note: You are %s hours behind server time." +msgstr[0] "" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:114 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:149 +msgid "Now" +msgstr "現在" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:118 +msgid "Clock" +msgstr "時鐘" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:146 +msgid "Choose a time" +msgstr "選擇一個時間" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:150 +msgid "Midnight" +msgstr "午夜" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:151 +msgid "6 a.m." +msgstr "上午 6 點" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:152 +msgid "Noon" +msgstr "中午" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:156 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:276 +msgid "Cancel" +msgstr "取消" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:216 +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:269 +msgid "Today" +msgstr "今天" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:220 +msgid "Calendar" +msgstr "日曆" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:267 +msgid "Yesterday" +msgstr "昨天" + +#: contrib/admin/static/admin/js/admin/DateTimeShortcuts.js:271 +msgid "Tomorrow" +msgstr "明天" + +#: contrib/admin/static/admin/js/calendar.js:8 +msgid "" +"January February March April May June July August September October November " +"December" +msgstr "一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月" + +#: contrib/admin/static/admin/js/calendar.js:9 +msgid "S M T W T F S" +msgstr "日 一 二 三 四 五 六" + +#: contrib/admin/static/admin/js/collapse.js:8 +#: contrib/admin/static/admin/js/collapse.js:19 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Show" +msgstr "顯示" + +#: contrib/admin/static/admin/js/collapse.js:16 +#: contrib/admin/static/admin/js/collapse.min.js:1 +msgid "Hide" +msgstr "隱藏" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_Hant/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -0,0 +1,837 @@ +# This file is distributed under the same license as the Django package. +# +# Translators: +# ilay , 2012 +# Jannis Leidel , 2011 +# mail6543210 , 2013-2014 +# ming hsien tzang , 2011 +# tcc , 2011 +# Yeh-Yung , 2013 +# Yeh-Yung , 2012 +msgid "" +msgstr "" +"Project-Id-Version: django\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2014-05-19 15:12+0200\n" +"PO-Revision-Date: 2014-08-20 07:38+0000\n" +"Last-Translator: Claude Paroz \n" +"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" +"language/zh_TW/)\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Language: zh_TW\n" +"Plural-Forms: nplurals=1; plural=0;\n" + +#: contrib/admin/actions.py:50 +#, python-format +msgid "Successfully deleted %(count)d %(items)s." +msgstr "成功的刪除了 %(count)d 個 %(items)s." + +#: contrib/admin/actions.py:62 contrib/admin/options.py:1616 +#, python-format +msgid "Cannot delete %(name)s" +msgstr "無法刪除 %(name)s" + +#: contrib/admin/actions.py:64 contrib/admin/options.py:1618 +msgid "Are you sure?" +msgstr "你確定嗎？" + +#: contrib/admin/actions.py:84 +#, python-format +msgid "Delete selected %(verbose_name_plural)s" +msgstr "刪除所選的 %(verbose_name_plural)s" + +#: contrib/admin/apps.py:11 +msgid "Administration" +msgstr "" + +#: contrib/admin/filters.py:104 contrib/admin/filters.py:199 +#: contrib/admin/filters.py:239 contrib/admin/filters.py:276 +#: contrib/admin/filters.py:387 +msgid "All" +msgstr "全部" + +#: contrib/admin/filters.py:240 +msgid "Yes" +msgstr "是" + +#: contrib/admin/filters.py:241 +msgid "No" +msgstr "否" + +#: contrib/admin/filters.py:255 +msgid "Unknown" +msgstr "未知" + +#: contrib/admin/filters.py:315 +msgid "Any date" +msgstr "任何日期" + +#: contrib/admin/filters.py:316 +msgid "Today" +msgstr "今天" + +#: contrib/admin/filters.py:320 +msgid "Past 7 days" +msgstr "過去 7 天" + +#: contrib/admin/filters.py:324 +msgid "This month" +msgstr "本月" + +#: contrib/admin/filters.py:328 +msgid "This year" +msgstr "今年" + +#: contrib/admin/forms.py:14 +#, python-format +msgid "" +"Please enter the correct %(username)s and password for a staff account. Note " +"that both fields may be case-sensitive." +msgstr "請輸入正確的工作人員%(username)s及密碼。請注意兩者皆區分大小寫。" + +#: contrib/admin/helpers.py:23 +msgid "Action:" +msgstr "動作:" + +#: contrib/admin/models.py:25 +msgid "action time" +msgstr "動作時間" + +#: contrib/admin/models.py:28 +msgid "object id" +msgstr "物件 id" + +#: contrib/admin/models.py:29 +msgid "object repr" +msgstr "物件 repr" + +#: contrib/admin/models.py:30 +msgid "action flag" +msgstr "動作旗標" + +#: contrib/admin/models.py:31 +msgid "change message" +msgstr "變更訊息" + +#: contrib/admin/models.py:36 +msgid "log entry" +msgstr "紀錄項目" + +#: contrib/admin/models.py:37 +msgid "log entries" +msgstr "紀錄項目" + +#: contrib/admin/models.py:46 +#, python-format +msgid "Added \"%(object)s\"." +msgstr "\"%(object)s\" 已新增。" + +#: contrib/admin/models.py:48 +#, python-format +msgid "Changed \"%(object)s\" - %(changes)s" +msgstr "\"%(object)s\" - %(changes)s 已變更。" + +#: contrib/admin/models.py:53 +#, python-format +msgid "Deleted \"%(object)s.\"" +msgstr "\"%(object)s\" 已刪除。" + +#: contrib/admin/models.py:55 +msgid "LogEntry Object" +msgstr "紀錄項目" + +#: contrib/admin/options.py:230 contrib/admin/options.py:259 +msgid "None" +msgstr "None" + +#: contrib/admin/options.py:956 +#, python-format +msgid "Changed %s." +msgstr "%s 已變更。" + +#: contrib/admin/options.py:956 contrib/admin/options.py:966 +#: contrib/admin/options.py:1808 +msgid "and" +msgstr "和" + +#: contrib/admin/options.py:961 +#, python-format +msgid "Added %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" 已新增。" + +#: contrib/admin/options.py:965 +#, python-format +msgid "Changed %(list)s for %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" 的 %(list)s 已變更。" + +#: contrib/admin/options.py:970 +#, python-format +msgid "Deleted %(name)s \"%(object)s\"." +msgstr "%(name)s \"%(object)s\" 已刪除。" + +#: contrib/admin/options.py:974 +msgid "No fields changed." +msgstr "沒有欄位被變更。" + +#: contrib/admin/options.py:1098 contrib/admin/options.py:1138 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." +msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下面再次編輯它。" + +#: contrib/admin/options.py:1109 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was added successfully. You may add another " +"%(name)s below." +msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下方加入其他 %(name)s 。" + +#: contrib/admin/options.py:1116 +#, python-format +msgid "The %(name)s \"%(obj)s\" was added successfully." +msgstr "%(name)s \"%(obj)s\" 已成功新增。" + +#: contrib/admin/options.py:1131 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " +"below." +msgstr "%(name)s \"%(obj)s\" 變更成功。你可以在下方再次編輯。" + +#: contrib/admin/options.py:1148 +#, python-format +msgid "" +"The %(name)s \"%(obj)s\" was changed successfully. You may add another " +"%(name)s below." +msgstr "%(name)s \"%(obj)s\" 變更成功。你可以在下方加入其他 %(name)s 。" + +#: contrib/admin/options.py:1157 +#, python-format +msgid "The %(name)s \"%(obj)s\" was changed successfully." +msgstr "%(name)s \"%(obj)s\" 已成功變更。" + +#: contrib/admin/options.py:1240 contrib/admin/options.py:1481 +msgid "" +"Items must be selected in order to perform actions on them. No items have " +"been changed." +msgstr "必須要有項目被選到才能對它們進行動作。沒有項目變更。" + +#: contrib/admin/options.py:1259 +msgid "No action selected." +msgstr "沒有動作被選。" + +#: contrib/admin/options.py:1271 +#, python-format +msgid "The %(name)s \"%(obj)s\" was deleted successfully." +msgstr "%(name)s \"%(obj)s\" 已成功刪除。" + +#: contrib/admin/options.py:1348 contrib/admin/options.py:1593 +#, python-format +msgid "%(name)s object with primary key %(key)r does not exist." +msgstr "主鍵 %(key)r 的 %(name)s 物件不存在。" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Add %s" +msgstr "新增 %s" + +#: contrib/admin/options.py:1398 +#, python-format +msgid "Change %s" +msgstr "變更 %s" + +#: contrib/admin/options.py:1460 +msgid "Database error" +msgstr "資料庫錯誤" + +#: contrib/admin/options.py:1523 +#, python-format +msgid "%(count)s %(name)s was changed successfully." +msgid_plural "%(count)s %(name)s were changed successfully." +msgstr[0] "共 %(count)s %(name)s 已變更成功。" + +#: contrib/admin/options.py:1550 +#, python-format +msgid "%(total_count)s selected" +msgid_plural "All %(total_count)s selected" +msgstr[0] "全部 %(total_count)s 個被選" + +#: contrib/admin/options.py:1556 +#, python-format +msgid "0 of %(cnt)s selected" +msgstr "%(cnt)s 中 0 個被選" + +#: contrib/admin/options.py:1655 +#, python-format +msgid "Change history: %s" +msgstr "變更歷史: %s" + +#. Translators: Model verbose name and instance representation, suitable to be +#. an item in a list +#: contrib/admin/options.py:1802 +#, python-format +msgid "%(class_name)s %(instance)s" +msgstr "%(class_name)s %(instance)s" + +#: contrib/admin/options.py:1809 +#, python-format +msgid "" +"Deleting %(class_name)s %(instance)s would require deleting the following " +"protected related objects: %(related_objects)s" +msgstr "" + +#: contrib/admin/sites.py:36 contrib/admin/templates/admin/base_site.html:3 +msgid "Django site admin" +msgstr "Django 網站管理" + +#: contrib/admin/sites.py:39 contrib/admin/templates/admin/base_site.html:6 +msgid "Django administration" +msgstr "Django 管理" + +#: contrib/admin/sites.py:42 +msgid "Site administration" +msgstr "網站管理" + +#: contrib/admin/sites.py:345 contrib/admin/templates/admin/login.html:47 +#: contrib/admin/templates/registration/password_reset_complete.html:18 +#: contrib/admin/tests.py:113 +msgid "Log in" +msgstr "登入" + +#: contrib/admin/sites.py:472 +#, python-format +msgid "%(app)s administration" +msgstr "" + +#: contrib/admin/templates/admin/404.html:4 +#: contrib/admin/templates/admin/404.html:8 +msgid "Page not found" +msgstr "頁面沒有找到" + +#: contrib/admin/templates/admin/404.html:10 +msgid "We're sorry, but the requested page could not be found." +msgstr "很抱歉，請求頁面無法找到。" + +#: contrib/admin/templates/admin/500.html:6 +#: contrib/admin/templates/admin/app_index.html:9 +#: contrib/admin/templates/admin/auth/user/change_password.html:13 +#: contrib/admin/templates/admin/base.html:50 +#: contrib/admin/templates/admin/change_form.html:18 +#: contrib/admin/templates/admin/change_list.html:40 +#: contrib/admin/templates/admin/delete_confirmation.html:8 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:8 +#: contrib/admin/templates/admin/invalid_setup.html:6 +#: contrib/admin/templates/admin/object_history.html:6 +#: contrib/admin/templates/registration/logged_out.html:4 +#: contrib/admin/templates/registration/password_change_done.html:6 +#: contrib/admin/templates/registration/password_change_form.html:7 +#: contrib/admin/templates/registration/password_reset_complete.html:6 +#: contrib/admin/templates/registration/password_reset_confirm.html:6 +#: contrib/admin/templates/registration/password_reset_done.html:6 +#: contrib/admin/templates/registration/password_reset_form.html:6 +msgid "Home" +msgstr "首頁" + +#: contrib/admin/templates/admin/500.html:7 +msgid "Server error" +msgstr "伺服器錯誤" + +#: contrib/admin/templates/admin/500.html:11 +msgid "Server error (500)" +msgstr "伺服器錯誤 (500)" + +#: contrib/admin/templates/admin/500.html:14 +msgid "Server Error (500)" +msgstr "伺服器錯誤 (500)" + +#: contrib/admin/templates/admin/500.html:15 +msgid "" +"There's been an error. It's been reported to the site administrators via " +"email and should be fixed shortly. Thanks for your patience." +msgstr "" +"存在一個錯誤。已透過電子郵件回報給網站管理員，並且應該很快就會被修正。謝謝你" +"的關心。" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Run the selected action" +msgstr "執行選擇的動作" + +#: contrib/admin/templates/admin/actions.html:4 +msgid "Go" +msgstr "去" + +#: contrib/admin/templates/admin/actions.html:11 +msgid "Click here to select the objects across all pages" +msgstr "點選這裡可選取全部頁面的物件" + +#: contrib/admin/templates/admin/actions.html:11 +#, python-format +msgid "Select all %(total_count)s %(module_name)s" +msgstr "選擇全部 %(total_count)s %(module_name)s" + +#: contrib/admin/templates/admin/actions.html:13 +msgid "Clear selection" +msgstr "清除選擇" + +#: contrib/admin/templates/admin/auth/user/add_form.html:6 +msgid "" +"First, enter a username and password. Then, you'll be able to edit more user " +"options." +msgstr "首先，輸入一個使用者名稱和密碼。然後你可以編輯更多使用者選項。" + +#: contrib/admin/templates/admin/auth/user/add_form.html:8 +msgid "Enter a username and password." +msgstr "輸入一個使用者名稱和密碼。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:17 +#: contrib/admin/templates/admin/auth/user/change_password.html:51 +#: contrib/admin/templates/admin/base.html:39 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Change password" +msgstr "變更密碼" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the error below." +msgstr "請更正下面的錯誤。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:27 +#: contrib/admin/templates/admin/change_form.html:47 +#: contrib/admin/templates/admin/change_list.html:67 +#: contrib/admin/templates/admin/login.html:17 +#: contrib/admin/templates/registration/password_change_form.html:21 +msgid "Please correct the errors below." +msgstr "請修正以下錯誤" + +#: contrib/admin/templates/admin/auth/user/change_password.html:31 +#, python-format +msgid "Enter a new password for the user %(username)s." +msgstr "為使用者%(username)s輸入一個新的密碼。" + +#: contrib/admin/templates/admin/auth/user/change_password.html:38 +msgid "Password" +msgstr "密碼" + +#: contrib/admin/templates/admin/auth/user/change_password.html:44 +#: contrib/admin/templates/registration/password_change_form.html:42 +msgid "Password (again)" +msgstr "密碼(重複)" + +#: contrib/admin/templates/admin/auth/user/change_password.html:45 +msgid "Enter the same password as above, for verification." +msgstr "為檢查用，請輸入與上面相同的密碼。" + +#: contrib/admin/templates/admin/base.html:30 +msgid "Welcome," +msgstr "歡迎，" + +#: contrib/admin/templates/admin/base.html:36 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Documentation" +msgstr "文件" + +#: contrib/admin/templates/admin/base.html:41 +#: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:4 +msgid "Log out" +msgstr "登出" + +#: contrib/admin/templates/admin/change_form.html:21 +#: contrib/admin/templates/admin/index.html:31 +msgid "Add" +msgstr "新增" + +#: contrib/admin/templates/admin/change_form.html:33 +#: contrib/admin/templates/admin/object_history.html:10 +msgid "History" +msgstr "歷史" + +#: contrib/admin/templates/admin/change_form.html:35 +#: contrib/admin/templates/admin/edit_inline/stacked.html:9 +#: contrib/admin/templates/admin/edit_inline/tabular.html:30 +msgid "View on site" +msgstr "在網站上檢視" + +#: contrib/admin/templates/admin/change_list.html:58 +#, python-format +msgid "Add %(name)s" +msgstr "新增 %(name)s" + +#: contrib/admin/templates/admin/change_list.html:78 +msgid "Filter" +msgstr "過濾器" + +#: contrib/admin/templates/admin/change_list_results.html:17 +msgid "Remove from sorting" +msgstr "從排序中移除" + +#: contrib/admin/templates/admin/change_list_results.html:18 +#, python-format +msgid "Sorting priority: %(priority_number)s" +msgstr "優先排序：%(priority_number)s" + +#: contrib/admin/templates/admin/change_list_results.html:19 +msgid "Toggle sorting" +msgstr "切換排序" + +#: contrib/admin/templates/admin/delete_confirmation.html:12 +#: contrib/admin/templates/admin/submit_line.html:6 +msgid "Delete" +msgstr "刪除" + +#: contrib/admin/templates/admin/delete_confirmation.html:19 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " +"related objects, but your account doesn't have permission to delete the " +"following types of objects:" +msgstr "" +"刪除 %(object_name)s '%(escaped_object)s' 會把相關的物件也刪除，不過你的帳號" +"並沒有刪除以下型態物件的權限:" + +#: contrib/admin/templates/admin/delete_confirmation.html:27 +#, python-format +msgid "" +"Deleting the %(object_name)s '%(escaped_object)s' would require deleting the " +"following protected related objects:" +msgstr "" +"要刪除 %(object_name)s '%(escaped_object)s', 將要求刪除下面受保護的相關物件:" + +#: contrib/admin/templates/admin/delete_confirmation.html:35 +#, python-format +msgid "" +"Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " +"All of the following related items will be deleted:" +msgstr "" +"你確定想要刪除 %(object_name)s \"%(escaped_object)s\"？以下所有的相關項目都會" +"被刪除:" + +#: contrib/admin/templates/admin/delete_confirmation.html:40 +#: contrib/admin/templates/admin/delete_selected_confirmation.html:45 +msgid "Yes, I'm sure" +msgstr "是的，我確定" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:11 +msgid "Delete multiple objects" +msgstr "刪除多個物件" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:18 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would result in deleting related " +"objects, but your account doesn't have permission to delete the following " +"types of objects:" +msgstr "" +"要刪除所選的 %(objects_name)s, 結果會刪除相關物件, 但你的帳號無權刪除下面物件" +"型態:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:26 +#, python-format +msgid "" +"Deleting the selected %(objects_name)s would require deleting the following " +"protected related objects:" +msgstr "要刪除所選的 %(objects_name)s, 將要求刪除下面受保護的相關物件:" + +#: contrib/admin/templates/admin/delete_selected_confirmation.html:34 +#, python-format +msgid "" +"Are you sure you want to delete the selected %(objects_name)s? All of the " +"following objects and their related items will be deleted:" +msgstr "" +"你是否確定要刪除已選的 %(objects_name)s? 下面全部物件及其相關項目都將被刪除:" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:26 +#: contrib/admin/templates/admin/edit_inline/tabular.html:78 +msgid "Remove" +msgstr "移除" + +#: contrib/admin/templates/admin/edit_inline/stacked.html:27 +#: contrib/admin/templates/admin/edit_inline/tabular.html:77 +#, python-format +msgid "Add another %(verbose_name)s" +msgstr "新增其它 %(verbose_name)s" + +#: contrib/admin/templates/admin/edit_inline/tabular.html:17 +msgid "Delete?" +msgstr "刪除？" + +#: contrib/admin/templates/admin/filter.html:2 +#, python-format +msgid " By %(filter_title)s " +msgstr " 以 %(filter_title)s" + +#: contrib/admin/templates/admin/index.html:20 +#, python-format +msgid "Models in the %(name)s application" +msgstr "%(name)s 應用程式中的Model" + +#: contrib/admin/templates/admin/index.html:37 +msgid "Change" +msgstr "變更" + +#: contrib/admin/templates/admin/index.html:47 +msgid "You don't have permission to edit anything." +msgstr "你沒有編輯任何東西的權限。" + +#: contrib/admin/templates/admin/index.html:55 +msgid "Recent Actions" +msgstr "最近的動作" + +#: contrib/admin/templates/admin/index.html:56 +msgid "My Actions" +msgstr "我的動作" + +#: contrib/admin/templates/admin/index.html:60 +msgid "None available" +msgstr "無可用的" + +#: contrib/admin/templates/admin/index.html:74 +msgid "Unknown content" +msgstr "未知內容" + +#: contrib/admin/templates/admin/invalid_setup.html:12 +msgid "" +"Something's wrong with your database installation. Make sure the appropriate " +"database tables have been created, and make sure the database is readable by " +"the appropriate user." +msgstr "" +"你的資料庫安裝有錯誤。確定資料庫表格已經建立，並確定資料庫可被合適的使用者讀" +"取。" + +#: contrib/admin/templates/admin/login.html:37 +msgid "Password:" +msgstr "密碼：" + +#: contrib/admin/templates/admin/login.html:43 +msgid "Forgotten your password or username?" +msgstr "忘了你的密碼或是使用者名稱？" + +#: contrib/admin/templates/admin/object_history.html:22 +msgid "Date/time" +msgstr "日期/時間" + +#: contrib/admin/templates/admin/object_history.html:23 +msgid "User" +msgstr "使用者" + +#: contrib/admin/templates/admin/object_history.html:24 +msgid "Action" +msgstr "動作" + +#: contrib/admin/templates/admin/object_history.html:38 +msgid "" +"This object doesn't have a change history. It probably wasn't added via this " +"admin site." +msgstr "這個物件沒有變更的歷史。它可能不是透過這個管理網站新增的。" + +#: contrib/admin/templates/admin/pagination.html:10 +msgid "Show all" +msgstr "顯示全部" + +#: contrib/admin/templates/admin/pagination.html:11 +#: contrib/admin/templates/admin/submit_line.html:3 +msgid "Save" +msgstr "儲存" + +#: contrib/admin/templates/admin/search_form.html:7 +msgid "Search" +msgstr "搜尋" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(counter)s result" +msgid_plural "%(counter)s results" +msgstr[0] "%(counter)s 結果" + +#: contrib/admin/templates/admin/search_form.html:9 +#, python-format +msgid "%(full_result_count)s total" +msgstr "總共 %(full_result_count)s" + +#: contrib/admin/templates/admin/submit_line.html:8 +msgid "Save as new" +msgstr "儲存為新的" + +#: contrib/admin/templates/admin/submit_line.html:9 +msgid "Save and add another" +msgstr "儲存並新增另一個" + +#: contrib/admin/templates/admin/submit_line.html:10 +msgid "Save and continue editing" +msgstr "儲存並繼續編輯" + +#: contrib/admin/templates/registration/logged_out.html:8 +msgid "Thanks for spending some quality time with the Web site today." +msgstr "感謝你今天花了重要的時間停留在本網站。" + +#: contrib/admin/templates/registration/logged_out.html:10 +msgid "Log in again" +msgstr "重新登入" + +#: contrib/admin/templates/registration/password_change_done.html:7 +#: contrib/admin/templates/registration/password_change_form.html:8 +msgid "Password change" +msgstr "密碼變更" + +#: contrib/admin/templates/registration/password_change_done.html:14 +msgid "Your password was changed." +msgstr "你的密碼已變更。" + +#: contrib/admin/templates/registration/password_change_form.html:26 +msgid "" +"Please enter your old password, for security's sake, and then enter your new " +"password twice so we can verify you typed it in correctly." +msgstr "" +"為了安全上的考量，請輸入你的舊密碼，再輸入新密碼兩次，讓我們核驗你已正確地輸" +"入。" + +#: contrib/admin/templates/registration/password_change_form.html:32 +msgid "Old password" +msgstr "舊的密碼" + +#: contrib/admin/templates/registration/password_change_form.html:37 +msgid "New password" +msgstr "新的密碼" + +#: contrib/admin/templates/registration/password_change_form.html:48 +#: contrib/admin/templates/registration/password_reset_confirm.html:24 +msgid "Change my password" +msgstr "變更我的密碼" + +#: contrib/admin/templates/registration/password_reset_complete.html:7 +#: contrib/admin/templates/registration/password_reset_done.html:7 +#: contrib/admin/templates/registration/password_reset_form.html:7 +msgid "Password reset" +msgstr "密碼重設" + +#: contrib/admin/templates/registration/password_reset_complete.html:16 +msgid "Your password has been set. You may go ahead and log in now." +msgstr "你的密碼已設置，現在可以繼續登入。" + +#: contrib/admin/templates/registration/password_reset_confirm.html:7 +msgid "Password reset confirmation" +msgstr "密碼重設確認" + +#: contrib/admin/templates/registration/password_reset_confirm.html:17 +msgid "" +"Please enter your new password twice so we can verify you typed it in " +"correctly." +msgstr "請輸入你的新密碼兩次, 這樣我們才能檢查你的輸入是否正確。" + +#: contrib/admin/templates/registration/password_reset_confirm.html:21 +msgid "New password:" +msgstr "新密碼：" + +#: contrib/admin/templates/registration/password_reset_confirm.html:23 +msgid "Confirm password:" +msgstr "確認密碼：" + +#: contrib/admin/templates/registration/password_reset_confirm.html:29 +msgid "" +"The password reset link was invalid, possibly because it has already been " +"used. Please request a new password reset." +msgstr "密碼重設連結無效，可能因為他已使用。請重新請求密碼重設。" + +#: contrib/admin/templates/registration/password_reset_done.html:15 +msgid "" +"We've emailed you instructions for setting your password. You should be " +"receiving them shortly." +msgstr "" +"我們已將重設密碼的相關指示寄到您提交的電子郵件地址。您應該很快就會收到。" + +#: contrib/admin/templates/registration/password_reset_done.html:17 +msgid "" +"If you don't receive an email, please make sure you've entered the address " +"you registered with, and check your spam folder." +msgstr "" +"如果您未收到電子郵件，請確認您輸入的電子郵件地址與您註冊時輸入的一致，並檢查" +"您的垃圾郵件匣。" + +#: contrib/admin/templates/registration/password_reset_email.html:2 +#, python-format +msgid "" +"You're receiving this email because you requested a password reset for your " +"user account at %(site_name)s." +msgstr "這封電子郵件來自 %(site_name)s，因為你要求為帳號重新設定密碼。" + +#: contrib/admin/templates/registration/password_reset_email.html:4 +msgid "Please go to the following page and choose a new password:" +msgstr "請到該頁面選擇一個新的密碼：" + +#: contrib/admin/templates/registration/password_reset_email.html:8 +msgid "Your username, in case you've forgotten:" +msgstr "你的使用者名稱，萬一你已經忘記的話:" + +#: contrib/admin/templates/registration/password_reset_email.html:10 +msgid "Thanks for using our site!" +msgstr "感謝使用本網站！" + +#: contrib/admin/templates/registration/password_reset_email.html:12 +#, python-format +msgid "The %(site_name)s team" +msgstr "%(site_name)s 團隊" + +#: contrib/admin/templates/registration/password_reset_form.html:15 +msgid "" +"Forgotten your password? Enter your email address below, and we'll email " +"instructions for setting a new one." +msgstr "" +"忘記你的密碼? 請在下面輸入你的電子郵件位址, 然後我們會寄出設定新密碼的操作指" +"示。" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Email address:" +msgstr "電子信箱：" + +#: contrib/admin/templates/registration/password_reset_form.html:19 +msgid "Reset my password" +msgstr "重設我的密碼" + +#: contrib/admin/templatetags/admin_list.py:379 +msgid "All dates" +msgstr "所有日期" + +#: contrib/admin/views/main.py:34 +msgid "(None)" +msgstr "(無)" + +#: contrib/admin/views/main.py:107 +#, python-format +msgid "Select %s" +msgstr "選擇 %s" + +#: contrib/admin/views/main.py:109 +#, python-format +msgid "Select %s to change" +msgstr "選擇 %s 來變更" + +#: contrib/admin/widgets.py:91 +msgid "Date:" +msgstr "日期" + +#: contrib/admin/widgets.py:92 +msgid "Time:" +msgstr "時間" + +#: contrib/admin/widgets.py:176 +msgid "Lookup" +msgstr "查詢" + +#: contrib/admin/widgets.py:280 +msgid "Add Another" +msgstr "新增其它" + +#: contrib/admin/widgets.py:333 +msgid "Currently:" +msgstr "目前：" + +#: contrib/admin/widgets.py:334 +msgid "Change:" +msgstr "變動：" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po python-django-1.7.4/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po --- python-django-1.6.6/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_TW/LC_MESSAGES/djangojs.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,17 +1,16 @@ # This file is distributed under the same license as the Django package. # # Translators: -# ilay , 2012 -# mail6543210 , 2013 -# tcc , 2011 -# yyc1217 , 2012 +# , 2012. +# tcc , 2011. +# , 2012. msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-02 16:18+0200\n" -"PO-Revision-Date: 2013-04-29 08:25+0000\n" -"Last-Translator: claudep \n" +"POT-Creation-Date: 2012-03-23 02:35+0100\n" +"PO-Revision-Date: 2012-09-20 05:46+0000\n" +"Last-Translator: yyc1217 \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -45,7 +44,7 @@ #: static/admin/js/SelectFilter2.js:61 msgid "Choose all" -msgstr "全選" +msgstr "全部選擇" #: static/admin/js/SelectFilter2.js:61 #, c-format @@ -94,7 +93,7 @@ "action, your unsaved changes will be lost." msgstr "你尚未儲存一個可編輯欄位的變更。如果你執行動作, 未儲存的變更將會遺失。" -#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:5 +#: static/admin/js/actions.js:121 static/admin/js/actions.min.js:6 msgid "" "You have selected an action, but you haven't saved your changes to " "individual fields yet. Please click OK to save. You'll need to re-run the " @@ -111,13 +110,13 @@ msgstr "" "你已選了一個動作, 但沒有任何改變。你可能動到 '去' 按鈕, 而不是 '儲存' 按鈕。" -#: static/admin/js/calendar.js:8 +#: static/admin/js/calendar.js:26 msgid "" "January February March April May June July August September October November " "December" msgstr "一月 二月 三月 四月 五月 六月 七月 八月 九月 十月 十一月 十二月" -#: static/admin/js/calendar.js:9 +#: static/admin/js/calendar.js:27 msgid "S M T W T F S" msgstr "日 一 二 三 四 五 六" @@ -126,53 +125,53 @@ msgid "Show" msgstr "顯示" -#: static/admin/js/collapse.js:16 static/admin/js/collapse.min.js:1 +#: static/admin/js/collapse.js:15 static/admin/js/collapse.min.js:1 msgid "Hide" msgstr "隱藏" -#: static/admin/js/admin/DateTimeShortcuts.js:52 -#: static/admin/js/admin/DateTimeShortcuts.js:88 +#: static/admin/js/admin/DateTimeShortcuts.js:49 +#: static/admin/js/admin/DateTimeShortcuts.js:85 msgid "Now" msgstr "現在" -#: static/admin/js/admin/DateTimeShortcuts.js:56 +#: static/admin/js/admin/DateTimeShortcuts.js:53 msgid "Clock" msgstr "時鐘" -#: static/admin/js/admin/DateTimeShortcuts.js:84 +#: static/admin/js/admin/DateTimeShortcuts.js:81 msgid "Choose a time" msgstr "選擇一個時間" -#: static/admin/js/admin/DateTimeShortcuts.js:89 +#: static/admin/js/admin/DateTimeShortcuts.js:86 msgid "Midnight" msgstr "午夜" -#: static/admin/js/admin/DateTimeShortcuts.js:90 +#: static/admin/js/admin/DateTimeShortcuts.js:87 msgid "6 a.m." msgstr "上午 6 點" -#: static/admin/js/admin/DateTimeShortcuts.js:91 +#: static/admin/js/admin/DateTimeShortcuts.js:88 msgid "Noon" msgstr "中午" -#: static/admin/js/admin/DateTimeShortcuts.js:95 -#: static/admin/js/admin/DateTimeShortcuts.js:208 +#: static/admin/js/admin/DateTimeShortcuts.js:92 +#: static/admin/js/admin/DateTimeShortcuts.js:204 msgid "Cancel" msgstr "取消" -#: static/admin/js/admin/DateTimeShortcuts.js:148 -#: static/admin/js/admin/DateTimeShortcuts.js:201 +#: static/admin/js/admin/DateTimeShortcuts.js:144 +#: static/admin/js/admin/DateTimeShortcuts.js:197 msgid "Today" msgstr "今天" -#: static/admin/js/admin/DateTimeShortcuts.js:152 +#: static/admin/js/admin/DateTimeShortcuts.js:148 msgid "Calendar" msgstr "日曆" -#: static/admin/js/admin/DateTimeShortcuts.js:199 +#: static/admin/js/admin/DateTimeShortcuts.js:195 msgid "Yesterday" msgstr "昨天" -#: static/admin/js/admin/DateTimeShortcuts.js:203 +#: static/admin/js/admin/DateTimeShortcuts.js:199 msgid "Tomorrow" msgstr "明天" Binary files /tmp/lMqPlwkWwp/python-django-1.6.6/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo and /tmp/Jq8S1njBul/python-django-1.7.4/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.mo differ diff -Nru python-django-1.6.6/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po python-django-1.7.4/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po --- python-django-1.6.6/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/locale/zh_TW/LC_MESSAGES/django.po 2015-01-27 17:12:30.000000000 +0000 @@ -1,20 +1,18 @@ # This file is distributed under the same license as the Django package. # # Translators: -# ilay , 2012 -# Jannis Leidel , 2011 -# mail6543210 , 2013 -# ming hsien tzang , 2011 -# tcc , 2011 -# yyc1217 , 2013 -# yyc1217 , 2012 +# , 2012. +# Jannis Leidel , 2011. +# ming hsien tzang , 2011. +# tcc , 2011. +# , 2012. msgid "" msgstr "" -"Project-Id-Version: django-core\n" +"Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-25 14:19+0200\n" -"PO-Revision-Date: 2013-08-17 08:29+0000\n" -"Last-Translator: Jannis Leidel \n" +"POT-Creation-Date: 2013-01-01 16:10+0100\n" +"PO-Revision-Date: 2013-01-02 08:52+0000\n" +"Last-Translator: yyc1217 \n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" "language/zh_TW/)\n" "MIME-Version: 1.0\n" @@ -23,21 +21,21 @@ "Language: zh_TW\n" "Plural-Forms: nplurals=1; plural=0;\n" -#: actions.py:49 +#: actions.py:48 #, python-format msgid "Successfully deleted %(count)d %(items)s." msgstr "成功的刪除了 %(count)d 個 %(items)s." -#: actions.py:61 options.py:1418 +#: actions.py:60 options.py:1347 #, python-format msgid "Cannot delete %(name)s" msgstr "無法刪除 %(name)s" -#: actions.py:63 options.py:1420 +#: actions.py:62 options.py:1349 msgid "Are you sure?" msgstr "你確定嗎？" -#: actions.py:84 +#: actions.py:83 #, python-format msgid "Delete selected %(verbose_name_plural)s" msgstr "刪除所選的 %(verbose_name_plural)s" @@ -83,7 +81,7 @@ msgid "" "Please enter the correct %(username)s and password for a staff account. Note " "that both fields may be case-sensitive." -msgstr "請輸入正確的工作人員%(username)s及密碼。請注意兩者皆區分大小寫。" +msgstr "" #: forms.py:19 msgid "Please log in again, because your session has expired." @@ -93,200 +91,185 @@ msgid "Action:" msgstr "動作:" -#: models.py:25 +#: models.py:24 msgid "action time" msgstr "動作時間" -#: models.py:28 +#: models.py:27 msgid "object id" msgstr "物件 id" -#: models.py:29 +#: models.py:28 msgid "object repr" msgstr "物件 repr" -#: models.py:30 +#: models.py:29 msgid "action flag" msgstr "動作旗標" -#: models.py:31 +#: models.py:30 msgid "change message" msgstr "變更訊息" -#: models.py:36 +#: models.py:35 msgid "log entry" msgstr "紀錄項目" -#: models.py:37 +#: models.py:36 msgid "log entries" msgstr "紀錄項目" -#: models.py:46 +#: models.py:45 #, python-format msgid "Added \"%(object)s\"." msgstr "\"%(object)s\" 已新增。" -#: models.py:48 +#: models.py:47 #, python-format msgid "Changed \"%(object)s\" - %(changes)s" msgstr "\"%(object)s\" - %(changes)s 已變更。" -#: models.py:53 +#: models.py:52 #, python-format msgid "Deleted \"%(object)s.\"" msgstr "\"%(object)s\" 已刪除。" -#: models.py:55 +#: models.py:54 msgid "LogEntry Object" msgstr "紀錄項目" -#: options.py:173 options.py:202 +#: options.py:156 options.py:172 msgid "None" msgstr "None" -#: options.py:763 +#: options.py:684 #, python-format msgid "Changed %s." msgstr "%s 已變更。" -#: options.py:763 options.py:773 options.py:1570 +#: options.py:684 options.py:694 msgid "and" msgstr "和" -#: options.py:768 +#: options.py:689 #, python-format msgid "Added %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" 以新增。" -#: options.py:772 +#: options.py:693 #, python-format msgid "Changed %(list)s for %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" 的 %(list)s 已變更。" -#: options.py:777 +#: options.py:698 #, python-format msgid "Deleted %(name)s \"%(object)s\"." msgstr "%(name)s \"%(object)s\" 已刪除。" -#: options.py:781 +#: options.py:702 msgid "No fields changed." msgstr "沒有欄位被變更。" -#: options.py:884 options.py:927 +#: options.py:807 options.py:860 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may edit it again below." msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下面再次編輯它。" -#: options.py:902 +#: options.py:835 #, python-format msgid "" "The %(name)s \"%(obj)s\" was added successfully. You may add another " "%(name)s below." msgstr "%(name)s \"%(obj)s\" 新增成功。你可以在下方加入其他 %(name)s 。" -#: options.py:906 +#: options.py:839 #, python-format msgid "The %(name)s \"%(obj)s\" was added successfully." msgstr "%(name)s \"%(obj)s\" 已成功新增。" -#: options.py:920 +#: options.py:853 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may edit it again " "below." msgstr "%(name)s \"%(obj)s\" 變更成功。你可以在下方再次編輯。" -#: options.py:934 +#: options.py:867 #, python-format msgid "" "The %(name)s \"%(obj)s\" was changed successfully. You may add another " "%(name)s below." msgstr "%(name)s \"%(obj)s\" 變更成功。你可以在下方加入其他 %(name)s 。" -#: options.py:940 +#: options.py:873 #, python-format msgid "The %(name)s \"%(obj)s\" was changed successfully." msgstr "%(name)s \"%(obj)s\" 已成功變更。" -#: options.py:1018 options.py:1278 +#: options.py:951 options.py:1211 msgid "" "Items must be selected in order to perform actions on them. No items have " "been changed." msgstr "必須要有項目被選到才能對它們進行動作。沒有項目變更。" -#: options.py:1037 +#: options.py:970 msgid "No action selected." msgstr "沒有動作被選。" -#: options.py:1117 +#: options.py:1050 #, python-format msgid "Add %s" msgstr "新增 %s" -#: options.py:1141 options.py:1386 +#: options.py:1074 options.py:1319 #, python-format msgid "%(name)s object with primary key %(key)r does not exist." msgstr "主鍵 %(key)r 的 %(name)s 物件不存在。" -#: options.py:1207 +#: options.py:1140 #, python-format msgid "Change %s" msgstr "變更 %s" -#: options.py:1257 +#: options.py:1190 msgid "Database error" msgstr "資料庫錯誤" -#: options.py:1320 +#: options.py:1253 #, python-format msgid "%(count)s %(name)s was changed successfully." msgid_plural "%(count)s %(name)s were changed successfully." msgstr[0] "共 %(count)s %(name)s 已變更成功。" -#: options.py:1347 +#: options.py:1280 #, python-format msgid "%(total_count)s selected" msgid_plural "All %(total_count)s selected" msgstr[0] "全部 %(total_count)s 個被選" -#: options.py:1352 +#: options.py:1285 #, python-format msgid "0 of %(cnt)s selected" msgstr "%(cnt)s 中 0 個被選" -#: options.py:1403 +#: options.py:1335 #, python-format msgid "The %(name)s \"%(obj)s\" was deleted successfully." msgstr "%(name)s \"%(obj)s\" 已成功刪除。" -#: options.py:1459 +#: options.py:1382 #, python-format msgid "Change history: %s" msgstr "變更歷史: %s" -#. Translators: Model verbose name and instance representation, suitable to be -#. an item in a list -#: options.py:1564 -#, python-format -msgid "%(class_name)s %(instance)s" -msgstr "%(class_name)s %(instance)s" - -#: options.py:1571 -#, python-format -msgid "" -"Deleting %(class_name)s %(instance)s would require deleting the following " -"protected related objects: %(related_objects)s" -msgstr "" -"刪除%(object_name)s '%(escaped_object)s'需一併刪除以下受保護的相關物件：" - -#: sites.py:318 tests.py:71 templates/admin/login.html:48 +#: sites.py:322 tests.py:57 templates/admin/login.html:48 #: templates/registration/password_reset_complete.html:19 #: views/decorators.py:24 msgid "Log in" msgstr "登入" -#: sites.py:386 +#: sites.py:388 msgid "Site administration" msgstr "網站管理" @@ -307,15 +290,15 @@ msgid "Lookup" msgstr "查詢" -#: widgets.py:260 +#: widgets.py:271 msgid "Add Another" msgstr "新增其它" -#: widgets.py:302 +#: widgets.py:316 msgid "Currently:" msgstr "目前：" -#: widgets.py:303 +#: widgets.py:317 msgid "Change:" msgstr "變動：" @@ -441,14 +424,8 @@ #: templates/admin/auth/user/change_password.html:27 #: templates/registration/password_change_form.html:20 msgid "Please correct the error below." -msgstr "請更正下面的錯誤。" - -#: templates/admin/change_form.html:44 templates/admin/change_list.html:67 -#: templates/admin/login.html:17 -#: templates/admin/auth/user/change_password.html:27 -#: templates/registration/password_change_form.html:20 -msgid "Please correct the errors below." -msgstr "" +msgid_plural "Please correct the errors below." +msgstr[0] "請更正下面的錯誤。" #: templates/admin/change_list.html:58 #, python-format @@ -714,7 +691,7 @@ "Please enter your old password, for security's sake, and then enter your new " "password twice so we can verify you typed it in correctly." msgstr "" -"為了安全上的考量，請輸入你的舊密碼，再輸入新密碼兩次，讓我們核驗你已正確地輸" +"為了安全上的考慮，請輸入你的舊密碼，再輸入新密碼兩次，讓我們核驗你已正確地輸" "入。" #: templates/registration/password_change_form.html:32 @@ -787,18 +764,9 @@ #: templates/registration/password_reset_done.html:17 msgid "" -"We've emailed you instructions for setting your password. You should be " -"receiving them shortly." -msgstr "" -"我們已將重設密碼的相關指示寄到您提交的電子郵件地址。您應該很快就會收到。" - -#: templates/registration/password_reset_done.html:19 -msgid "" -"If you don't receive an email, please make sure you've entered the address " -"you registered with, and check your spam folder." -msgstr "" -"如果您未收到電子郵件，請確認您輸入的電子郵件地址與您註冊時輸入的一致，並檢查" -"您的垃圾郵件匣。" +"We've emailed you instructions for setting your password to the email " +"address you submitted. You should be receiving it shortly." +msgstr "我們已經寄出設定密碼操作指示到你提供的電子郵件位址。請你儘快收取信件。" #: templates/registration/password_reset_email.html:2 #, python-format @@ -840,20 +808,20 @@ msgid "Reset my password" msgstr "重設我的密碼" -#: templatetags/admin_list.py:348 +#: templatetags/admin_list.py:344 msgid "All dates" msgstr "所有日期" -#: views/main.py:35 +#: views/main.py:33 msgid "(None)" msgstr "(無)" -#: views/main.py:84 +#: views/main.py:76 #, python-format msgid "Select %s" msgstr "選擇 %s" -#: views/main.py:86 +#: views/main.py:78 #, python-format msgid "Select %s to change" msgstr "選擇 %s 來變更" diff -Nru python-django-1.6.6/django/contrib/admin/migrations/0001_initial.py python-django-1.7.4/django/contrib/admin/migrations/0001_initial.py --- python-django-1.6.6/django/contrib/admin/migrations/0001_initial.py 1970-01-01 00:00:00.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/migrations/0001_initial.py 2015-01-27 17:12:30.000000000 +0000 @@ -0,0 +1,36 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +from django.conf import settings + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('contenttypes', '__first__'), + ] + + operations = [ + migrations.CreateModel( + name='LogEntry', + fields=[ + ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), + ('action_time', models.DateTimeField(auto_now=True, verbose_name='action time')), + ('object_id', models.TextField(null=True, verbose_name='object id', blank=True)), + ('object_repr', models.CharField(max_length=200, verbose_name='object repr')), + ('action_flag', models.PositiveSmallIntegerField(verbose_name='action flag')), + ('change_message', models.TextField(verbose_name='change message', blank=True)), + ('content_type', models.ForeignKey(to_field='id', blank=True, to='contenttypes.ContentType', null=True)), + ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)), + ], + options={ + 'ordering': ('-action_time',), + 'db_table': 'django_admin_log', + 'verbose_name': 'log entry', + 'verbose_name_plural': 'log entries', + }, + bases=(models.Model,), + ), + ] diff -Nru python-django-1.6.6/django/contrib/admin/models.py python-django-1.7.4/django/contrib/admin/models.py --- python-django-1.6.6/django/contrib/admin/models.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/models.py 2015-01-27 17:12:30.000000000 +0000 @@ -3,7 +3,7 @@ from django.db import models from django.conf import settings from django.contrib.contenttypes.models import ContentType -from django.contrib.admin.util import quote +from django.contrib.admin.utils import quote from django.core.urlresolvers import reverse, NoReverseMatch from django.utils.translation import ugettext, ugettext_lazy as _ from django.utils.encoding import smart_text diff -Nru python-django-1.6.6/django/contrib/admin/options.py python-django-1.7.4/django/contrib/admin/options.py --- python-django-1.6.6/django/contrib/admin/options.py 2014-08-20 20:13:48.000000000 +0000 +++ python-django-1.7.4/django/contrib/admin/options.py 2015-01-27 17:12:30.000000000 +0000 @@ -1,19 +1,26 @@ +from collections import OrderedDict import copy import operator from functools import partial, reduce, update_wrapper +import warnings from django import forms from django.conf import settings from django.contrib import messages from django.contrib.admin import widgets, helpers -from django.contrib.admin.util import (unquote, flatten_fieldsets, get_deleted_objects, - model_format_dict, NestedObjects, lookup_needs_distinct) from django.contrib.admin import validation +from django.contrib.admin.checks import (BaseModelAdminChecks, ModelAdminChecks, + InlineModelAdminChecks) +from django.contrib.admin.exceptions import DisallowedModelAdminToField +from django.contrib.admin.utils import (quote, unquote, flatten_fieldsets, + get_deleted_objects, model_format_dict, NestedObjects, + lookup_needs_distinct) from django.contrib.admin.templatetags.admin_static import static from django.contrib.admin.templatetags.admin_urls import add_preserved_filters from django.contrib.auth import get_permission_codename -from django.contrib.contenttypes.models import ContentType -from django.core.exceptions import PermissionDenied, ValidationError, FieldError +from django.core import checks +from django.core.exceptions import (PermissionDenied, ValidationError, + FieldError, ImproperlyConfigured) from django.core.paginator import Paginator from django.core.urlresolvers import reverse from django.db import models, transaction, router @@ -28,25 +35,36 @@ from django.http.response import HttpResponseBase from django.shortcuts import get_object_or_404 from django.template.response import SimpleTemplateResponse, TemplateResponse +from django.utils import six from django.utils.decorators import method_decorator -from django.utils.datastructures import SortedDict +from django.utils.deprecation import (RenameMethodsBase, + RemovedInDjango18Warning, RemovedInDjango19Warning) +from django.utils.encoding import force_text, python_2_unicode_compatible from django.utils.html import escape, escapejs -from django.utils.safestring import mark_safe -from django.utils import six -from django.utils.deprecation import RenameMethodsBase from django.utils.http import urlencode from django.utils.text import capfirst, get_text_list from django.utils.translation import ugettext as _ from django.utils.translation import ungettext -from django.utils.encoding import force_text +from django.utils.safestring import mark_safe from django.views.decorators.csrf import csrf_protect IS_POPUP_VAR = '_popup' +TO_FIELD_VAR = '_to_field' + HORIZONTAL, VERTICAL = 1, 2 -# returns the