diff --git a/AUTHORS b/AUTHORS index 35ad3b7ef3..bc5c44b335 100644 --- a/AUTHORS +++ b/AUTHORS @@ -44,6 +44,7 @@ answer newbie questions, and generally made Django that much better: alang@bright-green.com Marty Alchin Daniel Alves Barbosa de Oliveira Vaz + AgarFu Andreas andy@jadedplanet.net Fabrice Aneche @@ -56,15 +57,21 @@ answer newbie questions, and generally made Django that much better: Ned Batchelder Shannon -jj Behrens Esdras Beleza + Chris Bennett James Bennett Ben Paul Bissex Simon Blanchard + Matt Boersma + boobsd@gmail.com Andrew Brehaut brut.alll@gmail.com Jonathan Buchanan + Trevor Caira + Ricardo Javier Cárdenes Medina Antonio Cavedoni C8E + cedric@terramater.net Chris Chamberlin Amit Chakradeo ChaosKCW @@ -72,6 +79,7 @@ answer newbie questions, and generally made Django that much better: Bryan Chow Michal Chruszcz Ian Clelland + colin@owlfish.com crankycoder@gmail.com Pete Crosier Matt Croydon @@ -91,10 +99,14 @@ answer newbie questions, and generally made Django that much better: Maximillian Dornseif Jeremy Dunck Andrew Durdin + dusk@woofle.net Andy Dustman Clint Ecker + Nick Efford + eibaan@gmail.com enlight Enrico + A. Murat Eren Ludvig Ericson Dirk Eschler Marc Fargas @@ -106,19 +118,26 @@ answer newbie questions, and generally made Django that much better: Eric Floehr Jorge Gajon gandalf@owca.info + Marc Garcia Baishampayan Ghose glin@seznam.cz martin.glueck@gmail.com GomoX + Mario Gonzalez + pradeep.gowda@gmail.com Simon Greenhill Owen Griffiths Espen Grindhaug + Thomas Güttler + dAniel hAhler Brian Harring Brant Harris Hawkeye Joe Heck Joel Heenan hipertracker@gmail.com + Deryck Hodge + Brett Hoerner Ian Holsman Kieran Holland Sung-Jin Hong @@ -128,6 +147,7 @@ answer newbie questions, and generally made Django that much better: Hyun Mi Ae Tom Insam Baurzhan Ismagulov + james_027@yahoo.com jcrasta@gmail.com Zak Johnson Michael Josephson @@ -135,18 +155,23 @@ answer newbie questions, and generally made Django that much better: junzhang.jn@gmail.com Antti Kaihola Ben Dean Kawamura - ian.g.kelly@gmail.com + Ian G. Kelly + Ben Khoo Garth Kidd kilian Sune Kirkeby Bastian Kleineidam Cameron Knight (ckknight) + Nena Kojadin + Igor Kolar Gasper Koren Martin Kosír Meir Kriheli Bruce Kroeze + krzysiek.pawlik@silvermedia.pl Joseph Kocherhans konrad@gwu.edu + kurtiss@meetro.com lakin.wecker@gmail.com Nick Lane Stuart Langridge @@ -158,13 +183,14 @@ answer newbie questions, and generally made Django that much better: lerouxb@gmail.com Waylan Limberg limodou + Philip Lindborg Matt McClanahan Martin Maney masonsimon+django@gmail.com Manuzhai Petar Marić Nuno Mariz - marijn@metronomo.cl + Marijn Vriens mark@junklight.com Yasushi Masuda mattycakes@gmail.com @@ -172,9 +198,13 @@ answer newbie questions, and generally made Django that much better: mccutchen@gmail.com michael.mcewan@gmail.com mikko@sorl.net + Slawek Mikula mitakummaa@gmail.com mmarshall + Andreas Mock Reza Mohammadi + Aljosa Mohorovic + Ramiro Morales Eric Moritz mrmachine Robin Munn @@ -184,6 +214,7 @@ answer newbie questions, and generally made Django that much better: Fraser Nevett Sam Newman Neal Norwitz + Todd O'Bryan oggie rob Jay Parlar pavithran s @@ -198,22 +229,26 @@ answer newbie questions, and generally made Django that much better: plisk Daniel Poelzleithner polpak@yahoo.com + Jyrki Pulliainen + Johann Queuniet J. Rademaker Michael Radziej - Ramiro Morales Massimiliano Ravelli Brian Ray remco@diji.biz rhettg@gmail.com Henrique Romano Armin Ronacher + Brian Rosner Oliver Rutherfurd Ivan Sagalaev (Maniac) Vinay Sajip David Schein scott@staplefish.com serbaut@gmail.com + John Shaffer Pete Shinners + Jozko Skrablin SmileyChris smurf@smurf.noris.de sopel @@ -222,6 +257,8 @@ answer newbie questions, and generally made Django that much better: Vasiliy Stavenko Thomas Steinacher nowell strite + Sundance + SuperJared Radek Švarz Swaroop C H Aaron Swartz @@ -231,10 +268,12 @@ answer newbie questions, and generally made Django that much better: thebjorn Zach Thompson tibimicu@gmax.net + tobias@neuyork.de Tom Tobin Joe Topjian torne-django@wolfpuppy.org.uk Karen Tracey + tstromberg@google.com Makoto Tsuyuki tt@gurgle.no Amit Upadhyay @@ -250,6 +289,7 @@ answer newbie questions, and generally made Django that much better: charly.wilhelm@gmail.com Rachel Willmer Gary Wilson + Jakub Wiśniowski wojtek ye7cakf02@sneakemail.com ymasuda@ethercube.com diff --git a/django/__init__.py b/django/__init__.py index 17d8c519cc..de473fa4e9 100644 --- a/django/__init__.py +++ b/django/__init__.py @@ -4,5 +4,6 @@ def get_version(): "Returns the version as a human-format string." v = '.'.join([str(i) for i in VERSION[:-1]]) if VERSION[-1]: - v += '-' + VERSION[-1] + from django.utils.version import get_svn_revision + v = '%s-%s-%s' % (v, VERSION[-1], get_svn_revision()) return v diff --git a/django/bin/make-messages.py b/django/bin/make-messages.py index bf9e7a1962..11616c9ca5 100755 --- a/django/bin/make-messages.py +++ b/django/bin/make-messages.py @@ -9,6 +9,7 @@ import re import os import sys import getopt +from itertools import dropwhile pythonize_re = re.compile(r'\n\s*//') @@ -83,7 +84,7 @@ def make_messages(): thefile = '%s.py' % file cmd = 'xgettext %s -d %s -L Perl --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) - (stdin, stdout, stderr) = os.popen3(cmd, 'b') + (stdin, stdout, stderr) = os.popen3(cmd, 't') msgs = stdout.read() errors = stderr.read() if errors: @@ -100,12 +101,13 @@ def make_messages(): thefile = file if file.endswith('.html'): src = open(os.path.join(dirpath, file), "rb").read() - open(os.path.join(dirpath, '%s.py' % file), "wb").write(templatize(src)) thefile = '%s.py' % file - if verbose: sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) - cmd = 'xgettext %s -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( - os.path.exists(potfile) and '--omit-header' or '', domain, os.path.join(dirpath, thefile)) - (stdin, stdout, stderr) = os.popen3(cmd, 'b') + open(os.path.join(dirpath, thefile), "wb").write(templatize(src)) + if verbose: + sys.stdout.write('processing file %s in %s\n' % (file, dirpath)) + cmd = 'xgettext -d %s -L Python --keyword=gettext_noop --keyword=gettext_lazy --keyword=ngettext_lazy:1,2 --keyword=ugettext_noop --keyword=ugettext_lazy --keyword=ungettext_lazy:1,2 --from-code UTF-8 -o - "%s"' % ( + domain, os.path.join(dirpath, thefile)) + (stdin, stdout, stderr) = os.popen3(cmd, 't') msgs = stdout.read() errors = stderr.read() if errors: @@ -116,13 +118,18 @@ def make_messages(): old = '#: '+os.path.join(dirpath, thefile)[2:] new = '#: '+os.path.join(dirpath, file)[2:] msgs = msgs.replace(old, new) + if os.path.exists(potfile): + # Strip the header + msgs = '\n'.join(dropwhile(len, msgs.split('\n'))) + else: + msgs = msgs.replace('charset=CHARSET', 'charset=UTF-8') if msgs: open(potfile, 'ab').write(msgs) if thefile != file: os.unlink(os.path.join(dirpath, thefile)) if os.path.exists(potfile): - (stdin, stdout, stderr) = os.popen3('msguniq "%s"' % potfile, 'b') + (stdin, stdout, stderr) = os.popen3('msguniq --to-code=utf-8 "%s"' % potfile, 'b') msgs = stdout.read() errors = stderr.read() if errors: diff --git a/django/conf/__init__.py b/django/conf/__init__.py index 021ecc8131..f28da2d764 100644 --- a/django/conf/__init__.py +++ b/django/conf/__init__.py @@ -37,6 +37,8 @@ class LazySettings(object): # __setattr__(), which would be an infinite loop. self.__dict__['_target'] = value else: + if self._target is None: + self._import_settings() setattr(self._target, name, value) def _import_settings(self): diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index ea92d13eb3..e11ea7531b 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -25,12 +25,12 @@ ADMINS = () INTERNAL_IPS = () # Local time zone for this installation. All choices can be found here: -# http://www.postgresql.org/docs/8.1/static/datetime-keywords.html#DATETIME-TIMEZONE-SET-TABLE +# http://en.wikipedia.org/wiki/List_of_tz_zones_by_name (although not all +# systems may support all possibilities). TIME_ZONE = 'America/Chicago' # Language code for this installation. All choices can be found here: # http://www.w3.org/TR/REC-html40/struct/dirlang.html#langcodes -# http://blogs.law.harvard.edu/tech/stories/storyReader$15 LANGUAGE_CODE = 'en-us' # Languages we provide translations for, out of the box. The language name @@ -54,6 +54,7 @@ LANGUAGES = ( ('gl', gettext_noop('Galician')), ('hu', gettext_noop('Hungarian')), ('he', gettext_noop('Hebrew')), + ('hr', gettext_noop('Croatian')), ('is', gettext_noop('Icelandic')), ('it', gettext_noop('Italian')), ('ja', gettext_noop('Japanese')), @@ -81,7 +82,7 @@ LANGUAGES = ( ) # Languages using BiDi (right-to-left) layout -LANGUAGES_BIDI = ("he", "ar") +LANGUAGES_BIDI = ("he", "ar", "fa") # If you set this to False, Django will make some optimizations so as not # to load the internationalization machinery. @@ -97,6 +98,9 @@ MANAGERS = ADMINS DEFAULT_CONTENT_TYPE = 'text/html' DEFAULT_CHARSET = 'utf-8' +# Encoding of files read from disk (template and initial SQL files). +FILE_CHARSET = 'utf-8' + # E-mail address that error messages come from. SERVER_EMAIL = 'root@localhost' @@ -280,6 +284,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = False # Whether sessions expire when a user # possible values. CACHE_BACKEND = 'simple://' CACHE_MIDDLEWARE_KEY_PREFIX = '' +CACHE_MIDDLEWARE_SECONDS = 600 #################### # COMMENTS # diff --git a/django/conf/locale/ca/LC_MESSAGES/django.mo b/django/conf/locale/ca/LC_MESSAGES/django.mo index f308c7589a..82cd1bee4b 100644 Binary files a/django/conf/locale/ca/LC_MESSAGES/django.mo and b/django/conf/locale/ca/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/ca/LC_MESSAGES/django.po b/django/conf/locale/ca/LC_MESSAGES/django.po index b8450ad1b9..451c60e2db 100644 --- a/django/conf/locale/ca/LC_MESSAGES/django.po +++ b/django/conf/locale/ca/LC_MESSAGES/django.po @@ -237,7 +237,7 @@ msgstr "Coreà" #: conf/global_settings.py:61 msgid "Kannada" -msgstr "" +msgstr "Canès" #: conf/global_settings.py:62 msgid "Latvian" @@ -1230,7 +1230,7 @@ msgstr "Pot editar-lo de nou abaix." #: contrib/admin/views/auth.py:30 msgid "Add user" -msgstr "Agregar usuari" +msgstr "Afegir usuari" #: contrib/admin/views/auth.py:57 msgid "Password changed successfully." @@ -1248,12 +1248,12 @@ msgstr "Lloc administratiu" #: contrib/admin/views/main.py:276 contrib/admin/views/main.py:361 #, python-format msgid "You may add another %s below." -msgstr "Pot agregar un altre %s abaix." +msgstr "Pot afegir un altre %s a baix." #: contrib/admin/views/main.py:294 #, python-format msgid "Add %s" -msgstr "Agregar %s" +msgstr "Afegir %s" #: contrib/admin/views/main.py:340 #, python-format diff --git a/django/conf/locale/de/LC_MESSAGES/django.mo b/django/conf/locale/de/LC_MESSAGES/django.mo index d1981a679d..307976e4d5 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/django.mo and b/django/conf/locale/de/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/django.po b/django/conf/locale/de/LC_MESSAGES/django.po index 3ccbefe249..6978cf2d44 100644 --- a/django/conf/locale/de/LC_MESSAGES/django.po +++ b/django/conf/locale/de/LC_MESSAGES/django.po @@ -3,10 +3,10 @@ # FIRST AUTHOR , YEAR. # msgid "" -msgstr "" -"Project-Id-Version: Django 1.0\n" +"" +msgstr "Project-Id-Version: Django 1.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-04-09 22:42+0200\n" +"POT-Creation-Date: 2007-07-28 12:33+0200\n" "PO-Revision-Date: 2007-02-05 03:19+0100\n" "Last-Translator: Jannis Leidel \n" "Language-Team: \n" @@ -19,591 +19,590 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "X-Generator: KBabel 1.11.4\n" -#: conf/global_settings.py:39 +#:conf/global_settings.py:38 msgid "Arabic" msgstr "Arabisch" -#: conf/global_settings.py:40 +#:conf/global_settings.py:39 msgid "Bengali" msgstr "Bengali" -#: conf/global_settings.py:41 +#:conf/global_settings.py:40 +msgid "Bulgarian" +msgstr "Bulgarisch" + +#:conf/global_settings.py:41 msgid "Catalan" msgstr "Katalanisch" -#: conf/global_settings.py:42 +#:conf/global_settings.py:42 msgid "Czech" msgstr "Tschechisch" -#: conf/global_settings.py:43 +#:conf/global_settings.py:43 msgid "Welsh" msgstr "Walisisch" -#: conf/global_settings.py:44 +#:conf/global_settings.py:44 msgid "Danish" msgstr "Dänisch" -#: conf/global_settings.py:45 +#:conf/global_settings.py:45 msgid "German" msgstr "Deutsch" -#: conf/global_settings.py:46 +#:conf/global_settings.py:46 msgid "Greek" msgstr "Griechisch" -#: conf/global_settings.py:47 +#:conf/global_settings.py:47 msgid "English" msgstr "Englisch" -#: conf/global_settings.py:48 +#:conf/global_settings.py:48 msgid "Spanish" msgstr "Spanisch" -#: conf/global_settings.py:49 +#:conf/global_settings.py:49 msgid "Argentinean Spanish" msgstr "Argentinisches Spanisch" -#: conf/global_settings.py:50 +#:conf/global_settings.py:50 +msgid "Persian" +msgstr "Persisch" + +#:conf/global_settings.py:51 msgid "Finnish" msgstr "Finnisch" -#: conf/global_settings.py:51 +#:conf/global_settings.py:52 msgid "French" msgstr "Französisch" -#: conf/global_settings.py:52 +#:conf/global_settings.py:53 msgid "Galician" msgstr "Galicisch" -#: conf/global_settings.py:53 +#:conf/global_settings.py:54 msgid "Hungarian" msgstr "Ungarisch" -#: conf/global_settings.py:54 +#:conf/global_settings.py:55 msgid "Hebrew" msgstr "Hebräisch" -#: conf/global_settings.py:55 +#:conf/global_settings.py:56 msgid "Icelandic" msgstr "Isländisch" -#: conf/global_settings.py:56 +#:conf/global_settings.py:57 msgid "Italian" msgstr "Italienisch" -#: conf/global_settings.py:57 +#:conf/global_settings.py:58 msgid "Japanese" msgstr "Japanisch" -#: conf/global_settings.py:58 +#:conf/global_settings.py:59 msgid "Korean" msgstr "Koreanisch" -#: conf/global_settings.py:59 +#:conf/global_settings.py:60 msgid "Kannada" msgstr "Kannada" -#: conf/global_settings.py:60 +#:conf/global_settings.py:61 msgid "Latvian" msgstr "Lettisch" -#: conf/global_settings.py:61 +#:conf/global_settings.py:62 msgid "Macedonian" msgstr "Mazedonisch" -#: conf/global_settings.py:62 +#:conf/global_settings.py:63 msgid "Dutch" msgstr "Holländisch" -#: conf/global_settings.py:63 +#:conf/global_settings.py:64 msgid "Norwegian" msgstr "Norwegisch" -#: conf/global_settings.py:64 +#:conf/global_settings.py:65 msgid "Polish" msgstr "Polnisch" -#: conf/global_settings.py:65 +#:conf/global_settings.py:66 msgid "Portugese" msgstr "Portugiesisch" -#: conf/global_settings.py:66 +#:conf/global_settings.py:67 msgid "Brazilian" msgstr "Brasilianisches Portugiesisch" -#: conf/global_settings.py:67 +#:conf/global_settings.py:68 msgid "Romanian" msgstr "Rumänisch" -#: conf/global_settings.py:68 +#:conf/global_settings.py:69 msgid "Russian" msgstr "Russisch" -#: conf/global_settings.py:69 +#:conf/global_settings.py:70 msgid "Slovak" msgstr "Slowakisch" -#: conf/global_settings.py:70 +#:conf/global_settings.py:71 msgid "Slovenian" msgstr "Slowenisch" -#: conf/global_settings.py:71 +#:conf/global_settings.py:72 msgid "Serbian" msgstr "Serbisch" -#: conf/global_settings.py:72 +#:conf/global_settings.py:73 msgid "Swedish" msgstr "Schwedisch" -#: conf/global_settings.py:73 +#:conf/global_settings.py:74 msgid "Tamil" msgstr "Tamilisch" -#: conf/global_settings.py:74 +#:conf/global_settings.py:75 msgid "Telugu" msgstr "Telugisch" -#: conf/global_settings.py:75 +#:conf/global_settings.py:76 msgid "Turkish" msgstr "Türkisch" -#: conf/global_settings.py:76 +#:conf/global_settings.py:77 msgid "Ukrainian" msgstr "Ukrainisch" -#: conf/global_settings.py:77 +#:conf/global_settings.py:78 msgid "Simplified Chinese" msgstr "Vereinfachtes Chinesisch" -#: conf/global_settings.py:78 +#:conf/global_settings.py:79 msgid "Traditional Chinese" msgstr "Traditionelles Chinesisch" -#: contrib/admin/filterspecs.py:40 -#, python-format +#:contrib/admin/filterspecs.py:42 +#,python-format msgid "" "

By %s:

\n" "
    \n" -msgstr "" -"

    Nach %s:

    \n" +msgstr "

    Nach %s:

    \n" "
      \n" -#: contrib/admin/filterspecs.py:70 contrib/admin/filterspecs.py:88 -#: contrib/admin/filterspecs.py:143 contrib/admin/filterspecs.py:169 +#:contrib/admin/filterspecs.py:72 contrib/admin/filterspecs.py:90 +#:contrib/admin/filterspecs.py:145 contrib/admin/filterspecs.py:171 msgid "All" msgstr "Alle" -#: contrib/admin/filterspecs.py:109 +#:contrib/admin/filterspecs.py:111 msgid "Any date" msgstr "Alle Daten" -#: contrib/admin/filterspecs.py:110 +#:contrib/admin/filterspecs.py:112 msgid "Today" msgstr "Heute" -#: contrib/admin/filterspecs.py:113 +#:contrib/admin/filterspecs.py:115 msgid "Past 7 days" msgstr "Letzte 7 Tage" -#: contrib/admin/filterspecs.py:115 +#:contrib/admin/filterspecs.py:117 msgid "This month" msgstr "Diesen Monat" -#: contrib/admin/filterspecs.py:117 +#:contrib/admin/filterspecs.py:119 msgid "This year" msgstr "Dieses Jahr" -#: contrib/admin/filterspecs.py:143 newforms/widgets.py:180 -#: oldforms/__init__.py:577 +#:contrib/admin/filterspecs.py:145 newforms/widgets.py:181 +#:oldforms/__init__.py:587 msgid "Yes" msgstr "Ja" -#: contrib/admin/filterspecs.py:143 newforms/widgets.py:180 -#: oldforms/__init__.py:577 +#:contrib/admin/filterspecs.py:145 newforms/widgets.py:181 +#:oldforms/__init__.py:587 msgid "No" msgstr "Nein" -#: contrib/admin/filterspecs.py:150 newforms/widgets.py:180 -#: oldforms/__init__.py:577 +#:contrib/admin/filterspecs.py:152 newforms/widgets.py:181 +#:oldforms/__init__.py:587 msgid "Unknown" msgstr "Unbekannt" -#: contrib/admin/models.py:16 +#:contrib/admin/models.py:17 msgid "action time" msgstr "Zeitpunkt der Aktion" -#: contrib/admin/models.py:19 +#:contrib/admin/models.py:20 msgid "object id" msgstr "Objekt-ID" -#: contrib/admin/models.py:20 +#:contrib/admin/models.py:21 msgid "object repr" msgstr "Objekt Darst." -#: contrib/admin/models.py:21 +#:contrib/admin/models.py:22 msgid "action flag" msgstr "Aktionskennzeichen" -#: contrib/admin/models.py:22 +#:contrib/admin/models.py:23 msgid "change message" msgstr "Änderungsmeldung" -#: contrib/admin/models.py:25 +#:contrib/admin/models.py:26 msgid "log entry" msgstr "Logeintrag" -#: contrib/admin/models.py:26 +#:contrib/admin/models.py:27 msgid "log entries" msgstr "Logeinträge" -#: contrib/admin/templates/admin/404.html:4 -#: contrib/admin/templates/admin/404.html:8 +#:contrib/admin/templates/admin/404.html:4 +#:contrib/admin/templates/admin/404.html:8 msgid "Page not found" msgstr "Seite nicht gefunden" -#: contrib/admin/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." +msgstr "Es tut uns leid, aber die angeforderte Seite konnte nicht gefunden werden." -#: contrib/admin/templates/admin/500.html:4 -#: contrib/admin/templates/admin/base.html:30 -#: contrib/admin/templates/admin/change_form.html:13 -#: contrib/admin/templates/admin/change_list.html:6 -#: contrib/admin/templates/admin/delete_confirmation.html:6 -#: contrib/admin/templates/admin/invalid_setup.html:4 -#: contrib/admin/templates/admin/object_history.html:5 -#: contrib/admin/templates/admin/auth/user/change_password.html:12 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -#: contrib/admin/templates/registration/logged_out.html:4 -#: contrib/admin/templates/registration/password_change_done.html:4 -#: contrib/admin/templates/registration/password_change_form.html:4 -#: contrib/admin/templates/registration/password_reset_done.html:4 -#: contrib/admin/templates/registration/password_reset_form.html:4 +#:contrib/admin/templates/admin/500.html:4 +#:contrib/admin/templates/admin/base.html:30 +#:contrib/admin/templates/admin/change_form.html:13 +#:contrib/admin/templates/admin/change_list.html:6 +#:contrib/admin/templates/admin/delete_confirmation.html:6 +#:contrib/admin/templates/admin/invalid_setup.html:4 +#:contrib/admin/templates/admin/object_history.html:5 +#:contrib/admin/templates/admin/auth/user/change_password.html:12 +#:contrib/admin/templates/admin_doc/bookmarklets.html:3 +#:contrib/admin/templates/registration/logged_out.html:4 +#:contrib/admin/templates/registration/password_change_done.html:4 +#:contrib/admin/templates/registration/password_change_form.html:4 +#:contrib/admin/templates/registration/password_reset_done.html:4 +#:contrib/admin/templates/registration/password_reset_form.html:4 msgid "Home" msgstr "Start" -#: contrib/admin/templates/admin/500.html:4 +#:contrib/admin/templates/admin/500.html:4 msgid "Server error" msgstr "Serverfehler" -#: contrib/admin/templates/admin/500.html:6 +#:contrib/admin/templates/admin/500.html:6 msgid "Server error (500)" msgstr "Serverfehler (500)" -#: contrib/admin/templates/admin/500.html:9 +#:contrib/admin/templates/admin/500.html:9 msgid "Server Error (500)" msgstr "Serverfehler (500)" -#: contrib/admin/templates/admin/500.html:10 +#:contrib/admin/templates/admin/500.html:10 msgid "" "There's been an error. It's been reported to the site administrators via e-" "mail and should be fixed shortly. Thanks for your patience." -msgstr "" -"Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-" +msgstr "Ein Fehler ist aufgetreten. Dieser Fehler wurde an die Serververwalter per E-" "Mail weitergegeben und sollte bald behoben sein. Vielen Dank für Ihr " "Verständnis." -#: contrib/admin/templates/admin/base.html:25 +#:contrib/admin/templates/admin/base.html:25 msgid "Welcome," msgstr "Willkommen," -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 +#:contrib/admin/templates/admin/base.html:25 +#:contrib/admin/templates/admin/change_form.html:10 +#:contrib/admin/templates/admin/change_list.html:5 +#:contrib/admin/templates/admin/delete_confirmation.html:3 +#:contrib/admin/templates/admin/object_history.html:3 +#:contrib/admin/templates/admin/auth/user/change_password.html:9 +#:contrib/admin/templates/admin_doc/bookmarklets.html:3 +#:contrib/admin/templates/registration/password_change_done.html:3 +#:contrib/admin/templates/registration/password_change_form.html:3 msgid "Documentation" msgstr "Dokumentation" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/admin/auth/user/change_password.html:15 -#: contrib/admin/templates/admin/auth/user/change_password.html:46 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/model_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 +#:contrib/admin/templates/admin/base.html:25 +#:contrib/admin/templates/admin/change_form.html:10 +#:contrib/admin/templates/admin/change_list.html:5 +#:contrib/admin/templates/admin/delete_confirmation.html:3 +#:contrib/admin/templates/admin/object_history.html:3 +#:contrib/admin/templates/admin/auth/user/change_password.html:9 +#:contrib/admin/templates/admin/auth/user/change_password.html:15 +#:contrib/admin/templates/admin/auth/user/change_password.html:46 +#:contrib/admin/templates/admin_doc/bookmarklets.html:4 +#:contrib/admin/templates/admin_doc/index.html:4 +#:contrib/admin/templates/admin_doc/missing_docutils.html:4 +#:contrib/admin/templates/admin_doc/model_detail.html:3 +#:contrib/admin/templates/admin_doc/model_index.html:5 +#:contrib/admin/templates/admin_doc/template_detail.html:4 +#:contrib/admin/templates/admin_doc/template_filter_index.html:5 +#:contrib/admin/templates/admin_doc/template_tag_index.html:5 +#:contrib/admin/templates/admin_doc/view_detail.html:4 +#:contrib/admin/templates/admin_doc/view_index.html:5 +#:contrib/admin/templates/registration/password_change_done.html:3 +#:contrib/admin/templates/registration/password_change_form.html:3 msgid "Change password" msgstr "Passwort ändern" -#: contrib/admin/templates/admin/base.html:25 -#: contrib/admin/templates/admin/change_form.html:10 -#: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/delete_confirmation.html:3 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/model_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/registration/password_change_done.html:3 -#: contrib/admin/templates/registration/password_change_form.html:3 -#: contrib/comments/templates/comments/form.html:6 +#:contrib/admin/templates/admin/base.html:25 +#:contrib/admin/templates/admin/change_form.html:10 +#:contrib/admin/templates/admin/change_list.html:5 +#:contrib/admin/templates/admin/delete_confirmation.html:3 +#:contrib/admin/templates/admin/object_history.html:3 +#:contrib/admin/templates/admin/auth/user/change_password.html:9 +#:contrib/admin/templates/admin_doc/bookmarklets.html:4 +#:contrib/admin/templates/admin_doc/index.html:4 +#:contrib/admin/templates/admin_doc/missing_docutils.html:4 +#:contrib/admin/templates/admin_doc/model_detail.html:3 +#:contrib/admin/templates/admin_doc/model_index.html:5 +#:contrib/admin/templates/admin_doc/template_detail.html:4 +#:contrib/admin/templates/admin_doc/template_filter_index.html:5 +#:contrib/admin/templates/admin_doc/template_tag_index.html:5 +#:contrib/admin/templates/admin_doc/view_detail.html:4 +#:contrib/admin/templates/admin_doc/view_index.html:5 +#:contrib/admin/templates/registration/password_change_done.html:3 +#:contrib/admin/templates/registration/password_change_form.html:3 +#:contrib/comments/templates/comments/form.html:6 msgid "Log out" msgstr "Abmelden" -#: contrib/admin/templates/admin/base_site.html:4 +#:contrib/admin/templates/admin/base_site.html:4 msgid "Django site admin" msgstr "Django-Systemverwaltung" -#: contrib/admin/templates/admin/base_site.html:7 +#:contrib/admin/templates/admin/base_site.html:7 msgid "Django administration" msgstr "Django-Verwaltung" -#: contrib/admin/templates/admin/change_form.html:15 -#: contrib/admin/templates/admin/index.html:28 +#:contrib/admin/templates/admin/change_form.html:15 +#:contrib/admin/templates/admin/index.html:28 msgid "Add" msgstr "Hinzufügen" -#: contrib/admin/templates/admin/change_form.html:21 -#: contrib/admin/templates/admin/object_history.html:5 +#:contrib/admin/templates/admin/change_form.html:21 +#:contrib/admin/templates/admin/object_history.html:5 msgid "History" msgstr "Geschichte" -#: contrib/admin/templates/admin/change_form.html:22 +#:contrib/admin/templates/admin/change_form.html:22 msgid "View on site" msgstr "Im Web anzeigen" -#: contrib/admin/templates/admin/change_form.html:32 -#: contrib/admin/templates/admin/auth/user/change_password.html:24 +#:contrib/admin/templates/admin/change_form.html:32 +#:contrib/admin/templates/admin/auth/user/change_password.html:24 msgid "Please correct the error below." msgid_plural "Please correct the errors below." msgstr[0] "Bitte den aufgeführten Fehler korrigieren." msgstr[1] "Bitte die aufgeführten Fehler korrigieren." -#: contrib/admin/templates/admin/change_form.html:50 +#:contrib/admin/templates/admin/change_form.html:50 msgid "Ordering" msgstr "Sortierung" -#: contrib/admin/templates/admin/change_form.html:53 +#:contrib/admin/templates/admin/change_form.html:53 msgid "Order:" msgstr "Reihenfolge:" -#: contrib/admin/templates/admin/change_list.html:12 -#, python-format +#:contrib/admin/templates/admin/change_list.html:12 +#,python-format msgid "Add %(name)s" msgstr "%(name)s hinzufügen" -#: contrib/admin/templates/admin/delete_confirmation.html:9 -#: contrib/admin/templates/admin/submit_line.html:3 +#:contrib/admin/templates/admin/delete_confirmation.html:9 +#:contrib/admin/templates/admin/submit_line.html:3 msgid "Delete" msgstr "Löschen" -#: contrib/admin/templates/admin/delete_confirmation.html:14 -#, python-format +#:contrib/admin/templates/admin/delete_confirmation.html:14 +#,python-format msgid "" "Deleting the %(object_name)s '%(escaped_object)s' would result in deleting " "related objects, but your account doesn't have permission to delete the " "following types of objects:" -msgstr "" -"Die Löschung des %(object_name)s '%(escaped_object)s' hätte die Löschung von " +msgstr "Die Löschung des %(object_name)s '%(escaped_object)s' hätte die Löschung von " "abhängigen Daten zur Folge, aber Sie haben nicht die nötigen Rechte um die " "folgenden abhängigen Daten zu löschen:" -#: contrib/admin/templates/admin/delete_confirmation.html:21 -#, python-format +#:contrib/admin/templates/admin/delete_confirmation.html:21 +#,python-format msgid "" "Are you sure you want to delete the %(object_name)s \"%(escaped_object)s\"? " "All of the following related items will be deleted:" -msgstr "" -"Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen " +msgstr "Sind Sie sicher, dass Sie %(object_name)s \"%(escaped_object)s\" löschen " "wollen? Es werden zusätzlich die folgenden abhängigen Daten mit gelöscht:" -#: contrib/admin/templates/admin/delete_confirmation.html:26 +#:contrib/admin/templates/admin/delete_confirmation.html:26 msgid "Yes, I'm sure" msgstr "Ja, ich bin sicher" -#: contrib/admin/templates/admin/filter.html:2 -#, python-format +#:contrib/admin/templates/admin/filter.html:2 +#,python-format msgid " By %(filter_title)s " msgstr " Nach %(filter_title)s " -#: contrib/admin/templates/admin/filters.html:4 +#:contrib/admin/templates/admin/filters.html:4 msgid "Filter" msgstr "Filter" -#: contrib/admin/templates/admin/index.html:17 -#, python-format +#:contrib/admin/templates/admin/index.html:17 +#,python-format msgid "Models available in the %(name)s application." msgstr "Modelle, die in der Anwendung %(name)s vorhanden sind." -#: contrib/admin/templates/admin/index.html:18 -#, python-format +#:contrib/admin/templates/admin/index.html:18 +#,python-format msgid "%(name)s" msgstr "%(name)s" -#: contrib/admin/templates/admin/index.html:34 +#:contrib/admin/templates/admin/index.html:34 msgid "Change" msgstr "Ändern" -#: contrib/admin/templates/admin/index.html:44 +#:contrib/admin/templates/admin/index.html:44 msgid "You don't have permission to edit anything." msgstr "Sie haben keine Berechtigung irgendwas zu ändern." -#: contrib/admin/templates/admin/index.html:52 +#:contrib/admin/templates/admin/index.html:52 msgid "Recent Actions" msgstr "Kürzliche Aktionen" -#: contrib/admin/templates/admin/index.html:53 +#:contrib/admin/templates/admin/index.html:53 msgid "My Actions" msgstr "Meine Aktionen" -#: contrib/admin/templates/admin/index.html:57 +#:contrib/admin/templates/admin/index.html:57 msgid "None available" msgstr "Keine vorhanden" -#: contrib/admin/templates/admin/invalid_setup.html:8 +#:contrib/admin/templates/admin/invalid_setup.html:8 msgid "" "Something's wrong with your database installation. Make sure the appropriate " "database tables have been created, and make sure the database is readable by " "the appropriate user." -msgstr "" -"Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass " -"die richtigen Datenbanktabellen angelegt wurden und " -"die Datenbank vom verwendeten Datenbankbenutzer auch lesbar ist." +msgstr "Etwas stimmt nicht mit der Datenbankkonfiguration. Bitte sicherstellen, dass " +"die richtigen Datenbanktabellen angelegt wurden und die Datenbank vom " +"verwendeten Datenbankbenutzer auch lesbar ist." -#: contrib/admin/templates/admin/login.html:17 -#: contrib/comments/templates/comments/form.html:6 -#: contrib/comments/templates/comments/form.html:8 +#:contrib/admin/templates/admin/login.html:17 +#:contrib/comments/templates/comments/form.html:6 +#:contrib/comments/templates/comments/form.html:8 msgid "Username:" msgstr "Benutzername:" -#: contrib/admin/templates/admin/login.html:20 -#: contrib/comments/templates/comments/form.html:8 +#:contrib/admin/templates/admin/login.html:20 +#:contrib/comments/templates/comments/form.html:8 msgid "Password:" msgstr "Passwort:" -#: contrib/admin/templates/admin/login.html:25 -#: contrib/admin/views/decorators.py:24 +#:contrib/admin/templates/admin/login.html:25 +#:contrib/admin/views/decorators.py:24 msgid "Log in" msgstr "Anmelden" -#: contrib/admin/templates/admin/object_history.html:18 +#:contrib/admin/templates/admin/object_history.html:18 msgid "Date/time" msgstr "Datum/Zeit" -#: contrib/admin/templates/admin/object_history.html:19 +#:contrib/admin/templates/admin/object_history.html:19 msgid "User" msgstr "Benutzer" -#: contrib/admin/templates/admin/object_history.html:20 +#:contrib/admin/templates/admin/object_history.html:20 msgid "Action" msgstr "Aktion" -#: contrib/admin/templates/admin/object_history.html:26 +#:contrib/admin/templates/admin/object_history.html:26 msgid "DATE_WITH_TIME_FULL" msgstr "j. N Y, H:i" -#: contrib/admin/templates/admin/object_history.html:36 +#:contrib/admin/templates/admin/object_history.html:36 msgid "" "This object doesn't have a change history. It probably wasn't added via this " "admin site." -msgstr "" -"Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht " +msgstr "Dieses Objekt hat keine Änderungsgeschichte. Es wurde möglicherweise nicht " "über diese Verwaltungsseiten angelegt." -#: contrib/admin/templates/admin/pagination.html:10 +#:contrib/admin/templates/admin/pagination.html:10 msgid "Show all" msgstr "Zeige alle" -#: contrib/admin/templates/admin/search_form.html:8 +#:contrib/admin/templates/admin/search_form.html:8 msgid "Go" msgstr "Los" -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format +#:contrib/admin/templates/admin/search_form.html:10 +#,python-format msgid "1 result" msgid_plural "%(counter)s results" msgstr[0] "Ein Ergebnis" msgstr[1] "%(counter)s Ergebnisse" -#: contrib/admin/templates/admin/search_form.html:10 -#, python-format +#:contrib/admin/templates/admin/search_form.html:10 +#,python-format msgid "%(full_result_count)s total" msgstr "%(full_result_count)s gesamt" -#: contrib/admin/templates/admin/submit_line.html:4 +#:contrib/admin/templates/admin/submit_line.html:4 msgid "Save as new" msgstr "Als neu sichern" -#: contrib/admin/templates/admin/submit_line.html:5 +#:contrib/admin/templates/admin/submit_line.html:5 msgid "Save and add another" msgstr "Sichern und neu hinzufügen" -#: contrib/admin/templates/admin/submit_line.html:6 +#:contrib/admin/templates/admin/submit_line.html:6 msgid "Save and continue editing" msgstr "Sichern und weiter bearbeiten" -#: contrib/admin/templates/admin/submit_line.html:7 +#:contrib/admin/templates/admin/submit_line.html:7 msgid "Save" msgstr "Sichern" -#: contrib/admin/templates/admin/auth/user/add_form.html:6 +#: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 " +msgstr "Zuerst einen Benutzer und ein Passwort eingeben. Danach können weitere " "Optionen für den Benutzer geändert werden." -#: contrib/admin/templates/admin/auth/user/add_form.html:12 +#:contrib/admin/templates/admin/auth/user/add_form.html:12 msgid "Username" msgstr "Benutzername" -#: contrib/admin/templates/admin/auth/user/add_form.html:18 -#: contrib/admin/templates/admin/auth/user/change_password.html:34 +#:contrib/admin/templates/admin/auth/user/add_form.html:18 +#:contrib/admin/templates/admin/auth/user/change_password.html:34 msgid "Password" msgstr "Passwort" -#: contrib/admin/templates/admin/auth/user/add_form.html:23 -#: contrib/admin/templates/admin/auth/user/change_password.html:39 +#:contrib/admin/templates/admin/auth/user/add_form.html:23 +#:contrib/admin/templates/admin/auth/user/change_password.html:39 msgid "Password (again)" msgstr "Passwort (wiederholen)" -#: contrib/admin/templates/admin/auth/user/add_form.html:24 -#: contrib/admin/templates/admin/auth/user/change_password.html:40 +#:contrib/admin/templates/admin/auth/user/add_form.html:24 +#:contrib/admin/templates/admin/auth/user/change_password.html:40 msgid "Enter the same password as above, for verification." msgstr "Bitte das gleiche Passwort zur Überprüfung nochmal eingeben." -#: contrib/admin/templates/admin/auth/user/change_password.html:28 -#, python-format +#:contrib/admin/templates/admin/auth/user/change_password.html:28 +#,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%(username)s ein." -#: contrib/admin/templates/admin_doc/bookmarklets.html:3 +#:contrib/admin/templates/admin_doc/bookmarklets.html:3 msgid "Bookmarklets" msgstr "Bookmarklets" -#: contrib/admin/templates/admin_doc/bookmarklets.html:5 +#:contrib/admin/templates/admin_doc/bookmarklets.html:5 msgid "Documentation bookmarklets" msgstr "Dokumentations-Bookmarklets" -#: contrib/admin/templates/admin_doc/bookmarklets.html:9 +#:contrib/admin/templates/admin_doc/bookmarklets.html:9 msgid "" "\n" "

      To install bookmarklets, drag the link to your bookmarks\n" @@ -612,9 +611,9 @@ msgid "" "bookmarklets require you to be viewing the site from a computer designated\n" "as \"internal\" (talk to your system administrator if you aren't sure if\n" "your computer is \"internal\").

      \n" -msgstr "" -"\n" -"

      Um Bookmarklets zu installieren, müssen diese Links in die\n" +msgstr "\n" +"

      Um Bookmarklets zu installieren, müssen diese Links in " +"die\n" "Browser-Werkzeugleiste gezogen werden, oder mittels rechter Maustaste in " "die\n" "Bookmarks gespeichert werden. Danach können die Bookmarklets von jeder " @@ -830,7 +829,7 @@ msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Bitte einen Benutzernamen und ein Passwort eingeben. Beide Felder " +"Bitte einen gültigen Benutzernamen und ein Passwort eingeben. Beide Felder " "berücksichtigen die Groß-/Kleinschreibung." #: contrib/admin/views/decorators.py:62 diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.mo b/django/conf/locale/de/LC_MESSAGES/djangojs.mo index 9f39c16444..896847bb99 100644 Binary files a/django/conf/locale/de/LC_MESSAGES/djangojs.mo and b/django/conf/locale/de/LC_MESSAGES/djangojs.mo differ diff --git a/django/conf/locale/de/LC_MESSAGES/djangojs.po b/django/conf/locale/de/LC_MESSAGES/djangojs.po index 3c0852ebac..936dcb454f 100644 --- a/django/conf/locale/de/LC_MESSAGES/djangojs.po +++ b/django/conf/locale/de/LC_MESSAGES/djangojs.po @@ -11,21 +11,21 @@ msgstr "" "PO-Revision-Date: 2005-12-04 13:21+0100\n" "Last-Translator: Dirk Eschler \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=iso-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" #: contrib/admin/media/js/SelectFilter2.js:33 #, perl-format msgid "Available %s" -msgstr "Verfgbare %s" +msgstr "Verfügbare %s" #: contrib/admin/media/js/SelectFilter2.js:41 msgid "Choose all" -msgstr "Alles auswhlen" +msgstr "Alles auswählen" #: contrib/admin/media/js/SelectFilter2.js:46 msgid "Add" -msgstr "Hinzufgen" +msgstr "Hinzufügen" #: contrib/admin/media/js/SelectFilter2.js:48 msgid "Remove" @@ -34,15 +34,15 @@ msgstr "Entfernen" #: contrib/admin/media/js/SelectFilter2.js:53 #, perl-format msgid "Chosen %s" -msgstr "Ausgewhlte %s" +msgstr "Ausgewählte %s" #: contrib/admin/media/js/SelectFilter2.js:54 msgid "Select your choice(s) and click " -msgstr "Gewnschte Auswahl treffen und " +msgstr "Gewünschte Auswahl treffen und " #: contrib/admin/media/js/SelectFilter2.js:59 msgid "Clear all" -msgstr "Alles abwhlen" +msgstr "Alles abwählen" #: contrib/admin/media/js/dateparse.js:26 #: contrib/admin/media/js/calendar.js:24 @@ -50,7 +50,7 @@ msgid "" "January February March April May June July August September October November " "December" msgstr "" -"Januar Februar Mrz April Mai Juni Juli August September Oktober November " +"Januar Februar März April Mai Juni Juli August September Oktober November " "Dezember" #: contrib/admin/media/js/dateparse.js:27 diff --git a/django/conf/locale/es/LC_MESSAGES/django.mo b/django/conf/locale/es/LC_MESSAGES/django.mo index b8b9185b6d..be8be19162 100644 Binary files a/django/conf/locale/es/LC_MESSAGES/django.mo and b/django/conf/locale/es/LC_MESSAGES/django.mo differ diff --git a/django/conf/locale/es/LC_MESSAGES/django.po b/django/conf/locale/es/LC_MESSAGES/django.po index 6b55435a12..5f11644cfa 100644 --- a/django/conf/locale/es/LC_MESSAGES/django.po +++ b/django/conf/locale/es/LC_MESSAGES/django.po @@ -2,23 +2,289 @@ # This file is distributed under the same license as the PACKAGE package. # Copyright (C) 2007 THE PACKAGE'S COPYRIGHT HOLDER. # -# Ricardo Javier Crdenes Medina , 2005. -# Ricardo Javier Cardenes Medina , 2005. -# AgarFu , 2007. -# Mario Gonzalez , 2007 msgid "" msgstr "" "Project-Id-Version: django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2007-02-24 17:08+0000\n" -"PO-Revision-Date: 2007-02-24 18:02-0600\n" +"POT-Creation-Date: 2007-08-17 15:35-0400\n" +"PO-Revision-Date: 2007-07-14 13:00-0500\n" "Last-Translator: Mario Gonzalez \n" "Language-Team: Castellano \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=ISO-8859-1\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" +#: db/models/manipulators.py:309 +#, python-format +msgid "%(object)s with this %(type)s already exists for the given %(field)s." +msgstr "%(object)s de este %(type)s ya existen en este %(field)s." + +#: db/models/manipulators.py:310 contrib/admin/views/main.py:342 +#: contrib/admin/views/main.py:344 contrib/admin/views/main.py:346 +#: core/validators.py:275 +msgid "and" +msgstr "y" + +#: db/models/fields/__init__.py:49 +#, python-format +msgid "%(optname)s with this %(fieldname)s already exists." +msgstr "Ya existe %(optname)s con este %(fieldname)s." + +#: db/models/fields/__init__.py:156 db/models/fields/__init__.py:313 +#: db/models/fields/__init__.py:721 db/models/fields/__init__.py:732 +#: newforms/fields.py:92 newforms/fields.py:490 newforms/fields.py:566 +#: newforms/fields.py:577 newforms/models.py:193 oldforms/__init__.py:373 +msgid "This field is required." +msgstr "Este campo es obligatorio." + +#: db/models/fields/__init__.py:411 +msgid "This value must be an integer." +msgstr "Este valor debe ser un entero." + +#: db/models/fields/__init__.py:446 +msgid "This value must be either True or False." +msgstr "Este valor debe ser Verdadero o Falso." + +#: db/models/fields/__init__.py:467 +msgid "This field cannot be null." +msgstr "Este campo no puede estar vacío." + +#: db/models/fields/__init__.py:501 core/validators.py:155 +msgid "Enter a valid date in YYYY-MM-DD format." +msgstr "Introduzca una fecha válida en formato AAAA-MM-DD." + +#: db/models/fields/__init__.py:570 core/validators.py:164 +msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." +msgstr "Introduzca una fecha/hora válida en formato AAAA-MM-DD HH:MM." + +#: db/models/fields/__init__.py:631 +msgid "This value must be a decimal number." +msgstr "Este valor debe ser un entero." + +#: db/models/fields/__init__.py:741 +msgid "Enter a valid filename." +msgstr "Introduzca un nombre de fichero válido" + +#: db/models/fields/__init__.py:883 +msgid "This value must be either None, True or False." +msgstr "Este valor debe ser Verdadero o Falso." + +#: db/models/fields/related.py:55 +#, python-format +msgid "Please enter a valid %s." +msgstr "Por favor, introduzca un %s válido." + +#: db/models/fields/related.py:661 +msgid "Separate multiple IDs with commas." +msgstr "Separe múltiples IDs con comas." + +#: db/models/fields/related.py:663 +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 uno." + +#: db/models/fields/related.py:710 +#, python-format +msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." +msgid_plural "" +"Please enter valid %(self)s IDs. The values %(value)r are invalid." +msgstr[0] "" +"Por favor, introduzca IDs de %(self)s válidos. El valor %(value)r no es " +"válido." +msgstr[1] "" +"Por favor, introduzca IDs de %(self)s válidos. Los valores %(value)r no son " +"válidos." + +#: conf/global_settings.py:38 +msgid "Arabic" +msgstr "Árabe" + +#: conf/global_settings.py:39 +msgid "Bengali" +msgstr "Bengalí" + +#: conf/global_settings.py:40 +msgid "Bulgarian" +msgstr "Búlgaro" + +#: conf/global_settings.py:41 +msgid "Catalan" +msgstr "Catalán" + +#: conf/global_settings.py:42 +msgid "Czech" +msgstr "Checo" + +#: conf/global_settings.py:43 +msgid "Welsh" +msgstr "Galés" + +#: conf/global_settings.py:44 +msgid "Danish" +msgstr "Danés" + +#: conf/global_settings.py:45 +msgid "German" +msgstr "Alemán" + +#: conf/global_settings.py:46 +msgid "Greek" +msgstr "Griego" + +#: conf/global_settings.py:47 +msgid "English" +msgstr "Inglés" + +#: conf/global_settings.py:48 +msgid "Spanish" +msgstr "Español" + +#: conf/global_settings.py:49 +msgid "Argentinean Spanish" +msgstr "Español Argentino" + +#: conf/global_settings.py:50 +msgid "Persian" +msgstr "Persa" + +#: conf/global_settings.py:51 +msgid "Finnish" +msgstr "Finés" + +#: conf/global_settings.py:52 +msgid "French" +msgstr "Francés" + +#: conf/global_settings.py:53 +msgid "Galician" +msgstr "Gallego" + +#: conf/global_settings.py:54 +msgid "Hungarian" +msgstr "Húngaro" + +#: conf/global_settings.py:55 +msgid "Hebrew" +msgstr "Hebreo" + +#: conf/global_settings.py:56 +msgid "Croatian" +msgstr "Croata" + +#: conf/global_settings.py:57 +msgid "Icelandic" +msgstr "Islandés" + +#: conf/global_settings.py:58 +msgid "Italian" +msgstr "Italiano" + +#: conf/global_settings.py:59 +msgid "Japanese" +msgstr "Japonés" + +#: conf/global_settings.py:60 +msgid "Korean" +msgstr "Koreano" + +#: conf/global_settings.py:61 +msgid "Kannada" +msgstr "Kannada" + +#: conf/global_settings.py:62 +msgid "Latvian" +msgstr "Latvio" + +#: conf/global_settings.py:63 +msgid "Macedonian" +msgstr "Macedonio" + +#: conf/global_settings.py:64 +msgid "Dutch" +msgstr "Alemán" + +#: conf/global_settings.py:65 +msgid "Norwegian" +msgstr "Noruego" + +#: conf/global_settings.py:66 +msgid "Polish" +msgstr "Polaco" + +#: conf/global_settings.py:67 +msgid "Portugese" +msgstr "Portugés" + +#: conf/global_settings.py:68 +msgid "Brazilian" +msgstr "Brasileño" + +#: conf/global_settings.py:69 +msgid "Romanian" +msgstr "Rumano" + +#: conf/global_settings.py:70 +msgid "Russian" +msgstr "Ruso" + +#: conf/global_settings.py:71 +msgid "Slovak" +msgstr "Eslovaco" + +#: conf/global_settings.py:72 +msgid "Slovenian" +msgstr "Esloveno" + +#: conf/global_settings.py:73 +msgid "Serbian" +msgstr "Serbio" + +#: conf/global_settings.py:74 +msgid "Swedish" +msgstr "Sueco" + +#: conf/global_settings.py:75 +msgid "Tamil" +msgstr "Tamil" + +#: conf/global_settings.py:76 +msgid "Telugu" +msgstr "Telugu" + +#: conf/global_settings.py:77 +msgid "Turkish" +msgstr "Turco" + +#: conf/global_settings.py:78 +msgid "Ukrainian" +msgstr "Ucraniano" + +#: conf/global_settings.py:79 +msgid "Simplified Chinese" +msgstr "Chino simplificado" + +#: conf/global_settings.py:80 +msgid "Traditional Chinese" +msgstr "Chino tradicional" + +#: views/generic/create_update.py:43 +#, python-format +msgid "The %(verbose_name)s was created successfully." +msgstr "El %(verbose_name)s se ha creado correctamente." + +#: views/generic/create_update.py:117 +#, python-format +msgid "The %(verbose_name)s was updated successfully." +msgstr "Se actualizó con éxito el %(verbose_name)s." + +#: views/generic/create_update.py:184 +#, python-format +msgid "The %(verbose_name)s was deleted." +msgstr "El %(verbose_name)s ha sido eliminado." + #: utils/dates.py:6 msgid "Monday" msgstr "Lunes" @@ -29,7 +295,7 @@ msgstr "Martes" #: utils/dates.py:6 msgid "Wednesday" -msgstr "Mircoles" +msgstr "Miércoles" #: utils/dates.py:6 msgid "Thursday" @@ -41,141 +307,169 @@ msgstr "Viernes" #: utils/dates.py:7 msgid "Saturday" -msgstr "Sbado" +msgstr "Sábado" #: utils/dates.py:7 msgid "Sunday" msgstr "Domingo" -#: utils/dates.py:14 +#: utils/dates.py:10 +msgid "Mon" +msgstr "Lun" + +#: utils/dates.py:10 +msgid "Tue" +msgstr "Mar" + +#: utils/dates.py:10 +msgid "Wed" +msgstr "Mie" + +#: utils/dates.py:10 +msgid "Thu" +msgstr "Jue" + +#: utils/dates.py:10 +msgid "Fri" +msgstr "Vie" + +#: utils/dates.py:11 +msgid "Sat" +msgstr "Sab" + +#: utils/dates.py:11 +msgid "Sun" +msgstr "Dom" + +#: utils/dates.py:18 msgid "January" msgstr "Enero" -#: utils/dates.py:14 +#: utils/dates.py:18 msgid "February" msgstr "Febrero" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 utils/dates.py:31 msgid "March" msgstr "Marzo" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 utils/dates.py:31 msgid "April" msgstr "Abril" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 utils/dates.py:31 msgid "May" msgstr "Mayo" -#: utils/dates.py:14 utils/dates.py:27 +#: utils/dates.py:18 utils/dates.py:31 msgid "June" msgstr "Junio" -#: utils/dates.py:15 utils/dates.py:27 +#: utils/dates.py:19 utils/dates.py:31 msgid "July" msgstr "Julio" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "August" msgstr "Agosto" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "September" msgstr "Septiembre" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "October" msgstr "Octubre" -#: utils/dates.py:15 +#: utils/dates.py:19 msgid "November" msgstr "Noviembre" -#: utils/dates.py:16 +#: utils/dates.py:20 msgid "December" msgstr "Diciembre" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "jan" msgstr "ene" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "feb" msgstr "feb" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "mar" msgstr "mar" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "apr" msgstr "abr" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "may" msgstr "may" -#: utils/dates.py:19 +#: utils/dates.py:23 msgid "jun" msgstr "jun" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "jul" msgstr "jul" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "aug" msgstr "ago" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "sep" msgstr "sep" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "oct" msgstr "oct" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "nov" msgstr "nov" -#: utils/dates.py:20 +#: utils/dates.py:24 msgid "dec" msgstr "dic" -#: utils/dates.py:27 +#: utils/dates.py:31 msgid "Jan." msgstr "Ene." -#: utils/dates.py:27 +#: utils/dates.py:31 msgid "Feb." msgstr "Feb." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Aug." msgstr "Ago." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Sept." msgstr "Sept." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Oct." msgstr "Oct." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Nov." msgstr "Nov." -#: utils/dates.py:28 +#: utils/dates.py:32 msgid "Dec." msgstr "Dic." #: utils/timesince.py:12 msgid "year" msgid_plural "years" -msgstr[0] "ao" -msgstr[1] "aos" +msgstr[0] "año" +msgstr[1] "años" #: utils/timesince.py:13 msgid "month" @@ -192,8 +486,8 @@ msgstr[1] "semanas" #: utils/timesince.py:15 msgid "day" msgid_plural "days" -msgstr[0] "da" -msgstr[1] "das" +msgstr[0] "día" +msgstr[1] "días" #: utils/timesince.py:16 msgid "hour" @@ -207,866 +501,422 @@ msgid_plural "minutes" msgstr[0] "minuto" msgstr[1] "minutos" -#: utils/translation/trans_real.py:362 +#: utils/timesince.py:39 +#, python-format +msgid "%(number)d %(type)s" +msgstr "%(number)d %(type)s" + +#: utils/timesince.py:45 +#, python-format +msgid ", %(number)d %(type)s" +msgstr ", %(number)d %(type)s" + +#: utils/text.py:127 +msgid "or" +msgstr "o" + +#: utils/dateformat.py:41 +msgid "p.m." +msgstr "p.m" + +#: utils/dateformat.py:42 +msgid "a.m." +msgstr "a.m" + +#: utils/dateformat.py:47 +msgid "PM" +msgstr "PM" + +#: utils/dateformat.py:48 +msgid "AM" +msgstr "AM" + +#: utils/dateformat.py:97 +msgid "midnight" +msgstr "media noche" + +#: utils/dateformat.py:99 +msgid "noon" +msgstr "medio día" + +#: utils/translation/trans_real.py:391 msgid "DATE_FORMAT" msgstr "j N Y" -#: utils/translation/trans_real.py:363 +#: utils/translation/trans_real.py:392 msgid "DATETIME_FORMAT" msgstr "j N Y P" -#: utils/translation/trans_real.py:364 +#: utils/translation/trans_real.py:393 msgid "TIME_FORMAT" msgstr "P" -#: utils/translation/trans_real.py:380 +#: utils/translation/trans_real.py:409 msgid "YEAR_MONTH_FORMAT" msgstr "F Y" -#: utils/translation/trans_real.py:381 +#: utils/translation/trans_real.py:410 msgid "MONTH_DAY_FORMAT" msgstr "j \\de F" -#: conf/global_settings.py:39 -msgid "Arabic" -msgstr "rabe" - -#: conf/global_settings.py:40 -msgid "Bengali" -msgstr "Bengal" - -#: conf/global_settings.py:41 -msgid "Catalan" -msgstr "Cataln" - -#: conf/global_settings.py:42 -msgid "Czech" -msgstr "Checo" - -#: conf/global_settings.py:43 -msgid "Welsh" -msgstr "Gals" - -#: conf/global_settings.py:44 -msgid "Danish" -msgstr "Dans" - -#: conf/global_settings.py:45 -msgid "German" -msgstr "Alemn" - -#: conf/global_settings.py:46 -msgid "Greek" -msgstr "Griego" - -#: conf/global_settings.py:47 -msgid "English" -msgstr "Ingls" - -#: conf/global_settings.py:48 -msgid "Spanish" -msgstr "Espaol" - -#: conf/global_settings.py:49 -msgid "Argentinean Spanish" -msgstr "Espaol Argentino" - -#: conf/global_settings.py:50 -msgid "Finnish" -msgstr "Fins" - -#: conf/global_settings.py:51 -msgid "French" -msgstr "Francs" - -#: conf/global_settings.py:52 -msgid "Galician" -msgstr "Gallego" - -#: conf/global_settings.py:53 -msgid "Hungarian" -msgstr "Hngaro" - -#: conf/global_settings.py:54 -msgid "Hebrew" -msgstr "Hebreo" - -#: conf/global_settings.py:55 -msgid "Icelandic" -msgstr "Islands" - -#: conf/global_settings.py:56 -msgid "Italian" -msgstr "Italiano" - -#: conf/global_settings.py:57 -msgid "Japanese" -msgstr "Japons" - -#: conf/global_settings.py:58 -msgid "Latvian" -msgstr "Latvio" - -#: conf/global_settings.py:59 -msgid "Macedonian" -msgstr "Macedonio" - -#: conf/global_settings.py:60 -msgid "Dutch" -msgstr "Alemn" - -#: conf/global_settings.py:61 -msgid "Norwegian" -msgstr "Noruego" - -#: conf/global_settings.py:62 -msgid "Polish" -msgstr "Polaco" - -#: conf/global_settings.py:63 -msgid "Brazilian" -msgstr "Brasileo" - -#: conf/global_settings.py:64 -msgid "Romanian" -msgstr "Rumano" - -#: conf/global_settings.py:65 -msgid "Russian" -msgstr "Ruso" - -#: conf/global_settings.py:66 -msgid "Slovak" -msgstr "Eslovaco" - -#: conf/global_settings.py:67 -msgid "Slovenian" -msgstr "Esloveno" - -#: conf/global_settings.py:68 -msgid "Serbian" -msgstr "Serbio" - -#: conf/global_settings.py:69 -msgid "Swedish" -msgstr "Sueco" - -#: conf/global_settings.py:70 -msgid "Tamil" -msgstr "Tamil" - -#: conf/global_settings.py:71 -msgid "Turkish" -msgstr "Turco" - -#: conf/global_settings.py:72 -msgid "Ukrainian" -msgstr "Ucraniano" - -#: conf/global_settings.py:73 -msgid "Simplified Chinese" -msgstr "Chino simplificado" - -#: conf/global_settings.py:74 -msgid "Traditional Chinese" -msgstr "Chino tradicional" - -#: db/models/manipulators.py:305 +#: newforms/fields.py:116 #, python-format -msgid "%(object)s with this %(type)s already exists for the given %(field)s." -msgstr "%(object)s de este %(type)s ya existen en este %(field)s." +msgid "Ensure this value has at most %(max)d characters (it has %(length)d)." +msgstr "" +"Asegúrese de que su texto tiene a lo más %(max)d caracteres (actualmente " +"tiene %(length)d)." -#: db/models/manipulators.py:306 contrib/admin/views/main.py:335 -#: contrib/admin/views/main.py:337 contrib/admin/views/main.py:339 -msgid "and" -msgstr "y" - -#: db/models/fields/related.py:53 +#: newforms/fields.py:118 #, python-format -msgid "Please enter a valid %s." -msgstr "Por favor, introduzca un %s vlido." +msgid "Ensure this value has at least %(min)d characters (it has %(length)d)." +msgstr "" +"Asegúrese de que su texto tiene al menos %(min)d caracteres (actualmente " +"tiene %(length)d)." -#: db/models/fields/related.py:642 -msgid "Separate multiple IDs with commas." -msgstr "Separe mltiples IDs con comas." - -#: db/models/fields/related.py:644 -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 ms de uno." - -#: db/models/fields/related.py:691 -#, python-format -msgid "Please enter valid %(self)s IDs. The value %(value)r is invalid." -msgid_plural "Please enter valid %(self)s IDs. The values %(value)r are invalid." -msgstr[0] "" -"Por favor, introduzca IDs de %(self)s vlidos. El valor %(value)r no es " -"vlido." -msgstr[1] "" -"Por favor, introduzca IDs de %(self)s vlidos. Los valores %(value)r no son " -"vlidos." - -#: db/models/fields/__init__.py:42 -#, python-format -msgid "%(optname)s with this %(fieldname)s already exists." -msgstr "Ya existe %(optname)s con este %(fieldname)s." - -#: db/models/fields/__init__.py:116 db/models/fields/__init__.py:273 -#: db/models/fields/__init__.py:605 db/models/fields/__init__.py:616 -#: newforms/models.py:177 newforms/fields.py:78 newforms/fields.py:374 -#: newforms/fields.py:450 newforms/fields.py:461 oldforms/__init__.py:352 -msgid "This field is required." -msgstr "Este campo es obligatorio." - -#: db/models/fields/__init__.py:366 -msgid "This value must be an integer." -msgstr "Este valor debe ser un entero." - -#: db/models/fields/__init__.py:401 -msgid "This value must be either True or False." -msgstr "Este valor debe ser Verdadero o Falso." - -#: db/models/fields/__init__.py:422 -msgid "This field cannot be null." -msgstr "Este campo no puede estar vaco." - -#: db/models/fields/__init__.py:454 core/validators.py:147 -msgid "Enter a valid date in YYYY-MM-DD format." -msgstr "Introduzca una fecha vlida en formato AAAA-MM-DD." - -#: db/models/fields/__init__.py:521 core/validators.py:156 -msgid "Enter a valid date/time in YYYY-MM-DD HH:MM format." -msgstr "Introduzca una fecha/hora vlida en formato AAAA-MM-DD HH:MM." - -#: db/models/fields/__init__.py:625 -msgid "Enter a valid filename." -msgstr "Introduzca un nombre de fichero vlido" - -#: template/defaultfilters.py:436 -msgid "yes,no,maybe" -msgstr "si,no,tal vez" - -#: newforms/models.py:164 newforms/fields.py:360 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "Escoja una opcin vlida. Esa opcin no est entre las aceptadas." - -#: newforms/models.py:181 newforms/fields.py:378 newforms/fields.py:454 -msgid "Enter a list of values." -msgstr "Introduzca una lista de valores." - -#: newforms/models.py:187 newforms/fields.py:387 -#, python-format -msgid "Select a valid choice. %s is not one of the available choices." -msgstr "Escoja una opcin vlida; '%s' no es una de las opciones disponibles." - -#: newforms/fields.py:101 newforms/fields.py:254 -#, python-format -msgid "Ensure this value has at most %d characters." -msgstr "Asegrese de que su texto tiene a lo ms %d caracteres." - -#: newforms/fields.py:103 newforms/fields.py:256 -#, python-format -msgid "Ensure this value has at least %d characters." -msgstr "Asegrese de que su texto tiene al menos %d caracteres." - -#: newforms/fields.py:126 core/validators.py:120 +#: newforms/fields.py:142 core/validators.py:127 msgid "Enter a whole number." -msgstr "Introduzca un nmero entero." +msgstr "Introduzca un número entero." -#: newforms/fields.py:128 +#: newforms/fields.py:144 newforms/fields.py:167 newforms/fields.py:197 #, python-format msgid "Ensure this value is less than or equal to %s." -msgstr "Asegrese de que este valor es menor o igual a %s." +msgstr "Asegúrese de que este valor es menor o igual a %s." -#: newforms/fields.py:130 +#: newforms/fields.py:146 newforms/fields.py:169 newforms/fields.py:199 #, python-format msgid "Ensure this value is greater than or equal to %s." -msgstr "Asegrese de que este valor es mayor o igual a %s." +msgstr "Asegúrese de que este valor es mayor o igual a %s." -#: newforms/fields.py:163 +#: newforms/fields.py:165 newforms/fields.py:192 +msgid "Enter a number." +msgstr "Introduzca un número." + +#: newforms/fields.py:201 +#, python-format +msgid "Ensure that there are no more than %s digits in total." +msgstr "Asegúrese de que no hay más de %s dígitos en total." + +#: newforms/fields.py:203 +#, python-format +msgid "Ensure that there are no more than %s decimal places." +msgstr "Asegúrese de que no hay más de %s decimales." + +#: newforms/fields.py:205 +#, python-format +msgid "Ensure that there are no more than %s digits before the decimal point." +msgstr "Asegúrese de que no hay más de %s dígitos antes del punto decimal." + +#: newforms/fields.py:238 newforms/fields.py:610 msgid "Enter a valid date." -msgstr "Introduzca una fecha vlida." +msgstr "Introduzca una fecha válida." -#: newforms/fields.py:190 +#: newforms/fields.py:265 newforms/fields.py:612 msgid "Enter a valid time." -msgstr "Introduzca una hora vlida." +msgstr "Introduzca una hora válida." -#: newforms/fields.py:226 +#: newforms/fields.py:301 msgid "Enter a valid date/time." -msgstr "Introduzca una fecha/hora vlida." +msgstr "Introduzca una fecha/hora válida." -#: newforms/fields.py:240 +#: newforms/fields.py:314 msgid "Enter a valid value." msgstr "Introduzca un valor correcto." -#: newforms/fields.py:269 core/validators.py:161 +#: newforms/fields.py:336 core/validators.py:169 msgid "Enter a valid e-mail address." -msgstr "Introduzca una direccin de correo electrnico vlida" +msgstr "Introduzca una dirección de correo electrónico válida" -#: newforms/fields.py:287 newforms/fields.py:309 -msgid "Enter a valid URL." -msgstr "Introduzca una URL vlida." - -#: newforms/fields.py:311 -msgid "This URL appears to be a broken link." -msgstr "La URL parece ser un enlace roto." - -#: newforms/widgets.py:170 oldforms/__init__.py:572 -#: contrib/admin/filterspecs.py:150 -msgid "Unknown" -msgstr "Desconocido" - -#: newforms/widgets.py:170 oldforms/__init__.py:572 -#: contrib/admin/filterspecs.py:143 -msgid "Yes" -msgstr "S" - -#: newforms/widgets.py:170 oldforms/__init__.py:572 -#: contrib/admin/filterspecs.py:143 -msgid "No" -msgstr "No" - -#: core/validators.py:64 -msgid "This value must contain only letters, numbers and underscores." -msgstr "Este valor debe contener slo letras, nmeros y guiones bajos." - -#: core/validators.py:68 -msgid "" -"This value must contain only letters, numbers, underscores, dashes or " -"slashes." -msgstr "Este valor debe contener letras, nmeros, guiones bajos o barras solamente." - -#: core/validators.py:72 -msgid "This value must contain only letters, numbers, underscores or hyphens." -msgstr "Este valor debe contener slo letras, nmeros, guiones bajos o medios." - -#: core/validators.py:76 -msgid "Uppercase letters are not allowed here." -msgstr "No se admiten letras maysculas." - -#: core/validators.py:80 -msgid "Lowercase letters are not allowed here." -msgstr "No se admiten letras minsculas." - -#: core/validators.py:87 -msgid "Enter only digits separated by commas." -msgstr "Introduzca slo dgitos separados por comas." - -#: core/validators.py:99 -msgid "Enter valid e-mail addresses separated by commas." -msgstr "Introduzca direcciones de correo vlidas separadas por comas." - -#: core/validators.py:103 -msgid "Please enter a valid IP address." -msgstr "Por favor introduzca una direccin IP vlida." - -#: core/validators.py:107 -msgid "Empty values are not allowed here." -msgstr "No se admiten valores vacos." - -#: core/validators.py:111 -msgid "Non-numeric characters aren't allowed here." -msgstr "No se admiten caracteres no numricos." - -#: core/validators.py:115 -msgid "This value can't be comprised solely of digits." -msgstr "Este valor no puede comprender slo dgitos." - -#: core/validators.py:124 -msgid "Only alphabetical characters are allowed here." -msgstr "Slo se admiten caracteres alfabticos." - -#: core/validators.py:139 -msgid "Year must be 1900 or later." -msgstr "El ao debe ser 1900 o posterior." - -#: core/validators.py:143 -#, python-format -msgid "Invalid date: %s." -msgstr "Fecha no vlida: %s" - -#: core/validators.py:152 -msgid "Enter a valid time in HH:MM format." -msgstr "Introduzca una hora vlida en formato HH:MM." - -#: core/validators.py:173 core/validators.py:443 oldforms/__init__.py:667 +#: newforms/fields.py:376 oldforms/__init__.py:686 core/validators.py:181 +#: core/validators.py:461 msgid "No file was submitted. Check the encoding type on the form." msgstr "" -"No se ha enviado ningn fichero. Compruebe el tipo de codificacin en el " +"No se ha enviado ningún fichero. Compruebe el tipo de codificación en el " "formulario." -#: core/validators.py:177 +#: newforms/fields.py:378 +msgid "No file was submitted." +msgstr "No se ha enviado ningún fichero" + +#: newforms/fields.py:380 oldforms/__init__.py:688 +msgid "The submitted file is empty." +msgstr "El fichero enviado está vacío." + +#: newforms/fields.py:397 core/validators.py:185 msgid "" "Upload a valid image. The file you uploaded was either not an image or a " "corrupted image." msgstr "" -"Enve una imagen vlida. El fichero que ha enviado no era una imagen o se " +"Envíe una imagen válida. El fichero que ha enviado no era una imagen o se " "trataba de una imagen corrupta." -#: core/validators.py:184 +#: newforms/fields.py:403 newforms/fields.py:425 +msgid "Enter a valid URL." +msgstr "Introduzca una URL válida." + +#: newforms/fields.py:427 +msgid "This URL appears to be a broken link." +msgstr "La URL parece ser un enlace roto." + +#: newforms/fields.py:478 newforms/models.py:180 +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 aceptadas." + +#: newforms/fields.py:494 newforms/fields.py:570 newforms/models.py:197 +msgid "Enter a list of values." +msgstr "Introduzca una lista de valores." + +#: newforms/fields.py:500 newforms/models.py:203 #, python-format -msgid "The URL %s does not point to a valid image." -msgstr "La URL %s no apunta a una imagen vlida." +msgid "Select a valid choice. %s is not one of the available choices." +msgstr "Escoja una opción válida; '%s' no es una de las opciones disponibles." -#: core/validators.py:188 -#, python-format -msgid "Phone numbers must be in XXX-XXX-XXXX format. \"%s\" is invalid." -msgstr "" -"Los nmeros de telfono deben guardar el formato XXX-XXX-XXXX. \"%s\" " -"no es vlido." +#: newforms/widgets.py:188 contrib/admin/filterspecs.py:152 +#: oldforms/__init__.py:591 +msgid "Unknown" +msgstr "Desconocido" -#: core/validators.py:196 -#, python-format -msgid "The URL %s does not point to a valid QuickTime video." -msgstr "La URL %s no apunta a un vdeo QuickTime vlido." +#: newforms/widgets.py:188 contrib/admin/filterspecs.py:145 +#: oldforms/__init__.py:591 +msgid "Yes" +msgstr "Sí" -#: core/validators.py:200 -msgid "A valid URL is required." -msgstr "Se precisa una URL vlida." +#: newforms/widgets.py:188 contrib/admin/filterspecs.py:145 +#: oldforms/__init__.py:591 +msgid "No" +msgstr "No" -#: core/validators.py:214 -#, python-format -msgid "" -"Valid HTML is required. Specific errors are:\n" -"%s" -msgstr "" -"Se precisa HTML vlido. Los errores especficos son:\n" -"%s" - -#: core/validators.py:221 -#, python-format -msgid "Badly formed XML: %s" -msgstr "XML mal formado: %s" - -#: core/validators.py:238 -#, python-format -msgid "Invalid URL: %s" -msgstr "URL no vlida: %s" - -#: core/validators.py:243 core/validators.py:245 -#, python-format -msgid "The URL %s is a broken link." -msgstr "La URL %s es un enlace roto." - -#: core/validators.py:251 -msgid "Enter a valid U.S. state abbreviation." -msgstr "Introduzca una abreviatura vlida de estado de los EEUU." - -#: core/validators.py:265 -#, python-format -msgid "Watch your mouth! The word %s is not allowed here." -msgid_plural "Watch your mouth! The words %s are not allowed here." -msgstr[0] "Cuida tu vocabulario! Aqu no admitimos la palabra %s." -msgstr[1] "Cuida tu vocabulario! Aqu no admitimos las palabras %s." - -#: core/validators.py:272 -#, python-format -msgid "This field must match the '%s' field." -msgstr "Este campo debe concordar con el campo '%s'." - -#: core/validators.py:291 -msgid "Please enter something for at least one field." -msgstr "Por favor, introduzca algo en al menos un campo." - -#: core/validators.py:300 core/validators.py:311 -msgid "Please enter both fields or leave them both empty." -msgstr "Por favor, rellene ambos campos o deje ambos vacos." - -#: core/validators.py:318 -#, python-format -msgid "This field must be given if %(field)s is %(value)s" -msgstr "Se debe proporcionar este campo si %(field)s es %(value)s" - -#: core/validators.py:330 -#, python-format -msgid "This field must be given if %(field)s is not %(value)s" -msgstr "Se debe proporcionar este campo si %(field)s no es %(value)s" - -#: core/validators.py:349 -msgid "Duplicate values are not allowed." -msgstr "No se admiten valores duplicados." - -#: core/validators.py:364 -#, python-format -msgid "This value must be between %(lower)s and %(upper)s." -msgstr "Este valor debe estar entre %(lower)s y %(upper)s." - -#: core/validators.py:367 -#, python-format -msgid "This value must be at least %s." -msgstr "Este valor debe ser como mnimo %s." - -#: core/validators.py:369 -#, python-format -msgid "This value must be no more than %s." -msgstr "Este valor no debe ser mayor que %s." - -#: core/validators.py:405 -#, python-format -msgid "This value must be a power of %s." -msgstr "Este valor debe ser una potencia de %s." - -#: core/validators.py:416 -msgid "Please enter a valid decimal number." -msgstr "Por favor, introduzca un nmero decimal vlido." - -#: core/validators.py:420 -#, python-format -msgid "Please enter a valid decimal number with at most %s total digit." -msgid_plural "Please enter a valid decimal number with at most %s total digits." -msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en " -"total." -msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en " -"total." - -#: core/validators.py:423 -#, python-format -msgid "Please enter a valid decimal number with a whole part of at most %s digit." -msgid_plural "Please enter a valid decimal number with a whole part of at most %s digits." -msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito en " -"su parte entera." -msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos en " -"su parte entera." - -#: core/validators.py:426 -#, python-format -msgid "Please enter a valid decimal number with at most %s decimal place." -msgid_plural "Please enter a valid decimal number with at most %s decimal places." -msgstr[0] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgito " -"decimal." -msgstr[1] "" -"Por favor, introduzca un nmero decimal vlido con a lo ms %s dgitos " -"decimales." - -#: core/validators.py:436 -#, python-format -msgid "Make sure your uploaded file is at least %s bytes big." -msgstr "Asegrese de que el fichero que enva tiene al menos %s bytes." - -#: core/validators.py:437 -#, python-format -msgid "Make sure your uploaded file is at most %s bytes big." -msgstr "Asegrese de que el fichero que enva tiene como mximo %s bytes." - -#: core/validators.py:454 -msgid "The format for this field is wrong." -msgstr "El formato de este campo es incorrecto." - -#: core/validators.py:469 -msgid "This field is invalid." -msgstr "Este campo no es vlido." - -#: core/validators.py:505 -#, python-format -msgid "Could not retrieve anything from %s." -msgstr "No pude obtener nada de %s." - -#: core/validators.py:508 -#, python-format -msgid "The URL %(url)s returned the invalid Content-Type header '%(contenttype)s'." -msgstr "" -"La URL %(url)s devolvi la cabecera Content-Type '%(contenttype)s', que no " -"es vlida." - -#: core/validators.py:541 -#, python-format -msgid "" -"Please close the unclosed %(tag)s tag from line %(line)s. (Line starts with " -"\"%(start)s\".)" -msgstr "" -"Por favor, cierre la etiqueta %(tag)s de la lnea %(line)s. (La lnea " -"empieza por \"%(start)s\".)" - -#: core/validators.py:545 -#, python-format -msgid "" -"Some text starting on line %(line)s is not allowed in that context. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"Parte del texto que comienza en la lnea %(line)s no est permitido en ese " -"contexto. (La lnea empieza por \"%(start)s\".)" - -#: core/validators.py:550 -#, python-format -msgid "" -"\"%(attr)s\" on line %(line)s is an invalid attribute. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"El \"%(attr)s\" de la lnea %(line)s no es un atributo vlido. (La lnea " -"empieza por \"%(start)s\".)" - -#: core/validators.py:555 -#, python-format -msgid "" -"\"<%(tag)s>\" on line %(line)s is an invalid tag. (Line starts with \"%" -"(start)s\".)" -msgstr "" -"La \"<%(tag)s>\" de la lnea %(line)s no es una etiqueta vlida. (La lnea " -"empieza por \"%(start)s\".)" - -#: core/validators.py:559 -#, python-format -msgid "" -"A tag on line %(line)s is missing one or more required attributes. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"A una etiqueta de la lnea %(line)s le faltan uno o ms atributos " -"requeridos. (La lnea empieza por \"%(start)s\".)" - -#: core/validators.py:564 -#, python-format -msgid "" -"The \"%(attr)s\" attribute on line %(line)s has an invalid value. (Line " -"starts with \"%(start)s\".)" -msgstr "" -"El atributo \"%(attr)s\" de la lnea %(line)s tiene un valor que no es " -"vlido. (La lnea empieza por \"%(start)s\".)" - -#: oldforms/__init__.py:387 -#, python-format -msgid "Ensure your text is less than %s character." -msgid_plural "Ensure your text is less than %s characters." -msgstr[0] "Asegrese de que su texto tiene menos de %s carcter." -msgstr[1] "Asegrese de que su texto tiene menos de %s caracteres." - -#: oldforms/__init__.py:392 -msgid "Line breaks are not allowed here." -msgstr "No se permiten saltos de lnea." - -#: oldforms/__init__.py:493 oldforms/__init__.py:566 oldforms/__init__.py:605 -#, python-format -msgid "Select a valid choice; '%(data)s' is not in %(choices)s." -msgstr "Escoja una opcin vlida; '%(data)s' no est en %(choices)s." - -#: oldforms/__init__.py:669 -msgid "The submitted file is empty." -msgstr "El fichero enviado est vaco." - -#: oldforms/__init__.py:725 -msgid "Enter a whole number between -32,768 and 32,767." -msgstr "Introduzca un nmero entero entre -32,768 y 32,767." - -#: oldforms/__init__.py:735 -msgid "Enter a positive number." -msgstr "Introduzca un nmero positivo." - -#: oldforms/__init__.py:745 -msgid "Enter a whole number between 0 and 32,767." -msgstr "Introduzca un nmero entero entre 0 y 32,767." - -#: contrib/contenttypes/models.py:26 +#: contrib/contenttypes/models.py:37 msgid "python model class name" -msgstr "nombre de mdulo python" +msgstr "nombre de módulo python" -#: contrib/contenttypes/models.py:29 +#: contrib/contenttypes/models.py:40 msgid "content type" msgstr "tipo de contenido" -#: contrib/contenttypes/models.py:30 +#: contrib/contenttypes/models.py:41 msgid "content types" msgstr "tipos de contenido" -#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:318 -msgid "URL" -msgstr "URL" +#: contrib/humanize/templatetags/humanize.py:17 +msgid "th" +msgstr "th" -#: contrib/flatpages/models.py:8 -msgid "Example: '/about/contact/'. Make sure to have leading and trailing slashes." -msgstr "" -"Ejemplo: '/about/contact/'. Asegrese de que pone barras al principio y al " -"final." +#: contrib/humanize/templatetags/humanize.py:17 +msgid "st" +msgstr "st" -#: contrib/flatpages/models.py:9 -msgid "title" -msgstr "ttulo" +#: contrib/humanize/templatetags/humanize.py:17 +msgid "nd" +msgstr "nd" -#: contrib/flatpages/models.py:10 -msgid "content" -msgstr "contenido" +#: contrib/humanize/templatetags/humanize.py:17 +msgid "rd" +msgstr "rd" -#: contrib/flatpages/models.py:11 -msgid "enable comments" -msgstr "admitir comentarios" +#: contrib/humanize/templatetags/humanize.py:47 +#, python-format +msgid "%(value).1f million" +msgid_plural "%(value).1f million" +msgstr[0] "%(value).1f millón" +msgstr[1] "%(value).1f millión" -#: contrib/flatpages/models.py:12 -msgid "template name" -msgstr "nombre de plantilla" +#: contrib/humanize/templatetags/humanize.py:50 +#, python-format +msgid "%(value).1f billion" +msgid_plural "%(value).1f billion" +msgstr[0] "%(value).1f billión" +msgstr[1] "%(value).1f billión" -#: contrib/flatpages/models.py:13 -msgid "" -"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " -"will use 'flatpages/default.html'." -msgstr "" -"Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema usar " -"'flatpages/default.html'." +#: contrib/humanize/templatetags/humanize.py:53 +#, python-format +msgid "%(value).1f trillion" +msgid_plural "%(value).1f trillion" +msgstr[0] "%(value).1f trillión" +msgstr[1] "%(value).1f trillión" -#: contrib/flatpages/models.py:14 -msgid "registration required" -msgstr "debe estar registrado" +#: contrib/humanize/templatetags/humanize.py:68 +msgid "one" +msgstr "uno" -#: contrib/flatpages/models.py:14 -msgid "If this is checked, only logged-in users will be able to view the page." -msgstr "Si est marcado, slo los usuarios registrados podrn ver la pgina." +#: contrib/humanize/templatetags/humanize.py:68 +msgid "two" +msgstr "dos" -#: contrib/flatpages/models.py:18 -msgid "flat page" -msgstr "pgina esttica" +#: contrib/humanize/templatetags/humanize.py:68 +msgid "three" +msgstr "tres" -#: contrib/flatpages/models.py:19 -msgid "flat pages" -msgstr "pginas estticas" +#: contrib/humanize/templatetags/humanize.py:68 +msgid "four" +msgstr "cuatro" -#: contrib/auth/views.py:39 +#: contrib/humanize/templatetags/humanize.py:68 +msgid "five" +msgstr "cinco" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "six" +msgstr "seis" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "seven" +msgstr "siete" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "eight" +msgstr "ocho" + +#: contrib/humanize/templatetags/humanize.py:68 +msgid "nine" +msgstr "nueve" + +#: contrib/auth/views.py:47 msgid "Logged out" -msgstr "Sesin terminada" +msgstr "Sesión terminada" -#: contrib/auth/models.py:38 contrib/auth/models.py:57 +#: contrib/auth/models.py:53 contrib/auth/models.py:73 msgid "name" msgstr "nombre" -#: contrib/auth/models.py:40 +#: contrib/auth/models.py:55 msgid "codename" -msgstr "nombre en cdigo" +msgstr "nombre en código" -#: contrib/auth/models.py:42 +#: contrib/auth/models.py:58 msgid "permission" msgstr "permiso" -#: contrib/auth/models.py:43 contrib/auth/models.py:58 +#: contrib/auth/models.py:59 contrib/auth/models.py:74 msgid "permissions" msgstr "permisos" -#: contrib/auth/models.py:60 +#: contrib/auth/models.py:77 msgid "group" msgstr "grupo" -#: contrib/auth/models.py:61 contrib/auth/models.py:100 +#: contrib/auth/models.py:78 contrib/auth/models.py:121 msgid "groups" msgstr "grupos" -#: contrib/auth/models.py:90 +#: contrib/auth/models.py:111 msgid "username" msgstr "nombre de usuario" -#: contrib/auth/models.py:90 +#: contrib/auth/models.py:111 msgid "" "Required. 30 characters or fewer. Alphanumeric characters only (letters, " "digits and underscores)." msgstr "" -"Requerido. 30 caracteres o menos. Slo caracteres alfanumricos (letras, " -"dgitos y guiones bajos)." +"Requerido. 30 caracteres o menos. Sólo caracteres alfanuméricos (letras, " +"dígitos y guiones bajos)." -#: contrib/auth/models.py:91 +#: contrib/auth/models.py:112 msgid "first name" msgstr "nombre" -#: contrib/auth/models.py:92 +#: contrib/auth/models.py:113 msgid "last name" msgstr "apellidos" -#: contrib/auth/models.py:93 +#: contrib/auth/models.py:114 msgid "e-mail address" -msgstr "direccin de correo" +msgstr "dirección de correo" -#: contrib/auth/models.py:94 +#: contrib/auth/models.py:115 msgid "password" msgstr "clave" -#: contrib/auth/models.py:94 +#: contrib/auth/models.py:115 msgid "" "Use '[algo]$[salt]$[hexdigest]' or use the change " "password form." msgstr "" "Use'[algo]$[sal]$[hash hexadecimal]' o use el " -"formulario para cambiar la contrasea." +"formulario para cambiar la contraseña." -#: contrib/auth/models.py:95 +#: contrib/auth/models.py:116 msgid "staff status" msgstr "es staff" -#: contrib/auth/models.py:95 +#: contrib/auth/models.py:116 msgid "Designates whether the user can log into this admin site." -msgstr "Indica si el usuario puede entrar en este sitio de administracin." +msgstr "Indica si el usuario puede entrar en este sitio de administración." -#: contrib/auth/models.py:96 +#: contrib/auth/models.py:117 msgid "active" msgstr "activo" -#: contrib/auth/models.py:96 +#: contrib/auth/models.py:117 msgid "" "Designates whether this user can log into the Django admin. Unselect this " "instead of deleting accounts." msgstr "" -"Indica si el usuario puede entrar en este sitio de administracin. Desmarque " +"Indica si el usuario puede entrar en este sitio de administración. Desmarque " "esto en lugar de borrar la cuenta." -#: contrib/auth/models.py:97 +#: contrib/auth/models.py:118 msgid "superuser status" msgstr "es superusuario" -#: contrib/auth/models.py:97 +#: contrib/auth/models.py:118 msgid "" "Designates that this user has all permissions without explicitly assigning " "them." msgstr "" -"Indica que este usuario tiene todos los permisos sin asignrselos " -"explcitamente." +"Indica que este usuario tiene todos los permisos sin asignárselos " +"explícitamente." -#: contrib/auth/models.py:98 +#: contrib/auth/models.py:119 msgid "last login" -msgstr "ltimo registro" +msgstr "Último registro" -#: contrib/auth/models.py:99 +#: contrib/auth/models.py:120 msgid "date joined" -msgstr "fecha de creacin" +msgstr "fecha de creación" -#: contrib/auth/models.py:101 +#: contrib/auth/models.py:122 msgid "" "In addition to the permissions manually assigned, this user will also get " "all permissions granted to each group he/she is in." msgstr "" -"Adems de los permisos asignados manualmente, este usuario tambin tendr " -"todos los permisos de los grupos en los que est." +"Además de los permisos asignados manualmente, este usuario también tendrá " +"todos los permisos de los grupos en los que esté." -#: contrib/auth/models.py:102 +#: contrib/auth/models.py:123 msgid "user permissions" msgstr "permisos" -#: contrib/auth/models.py:105 +#: contrib/auth/models.py:127 msgid "user" msgstr "usuario" -#: contrib/auth/models.py:106 +#: contrib/auth/models.py:128 msgid "users" msgstr "usuarios" -#: contrib/auth/models.py:111 +#: contrib/auth/models.py:134 msgid "Personal info" -msgstr "Informacin personal" +msgstr "Información personal" -#: contrib/auth/models.py:112 +#: contrib/auth/models.py:135 msgid "Permissions" msgstr "Permisos" -#: contrib/auth/models.py:113 +#: contrib/auth/models.py:136 msgid "Important dates" msgstr "Fechas importantes" -#: contrib/auth/models.py:114 +#: contrib/auth/models.py:137 msgid "Groups" msgstr "Grupos" -#: contrib/auth/models.py:258 +#: contrib/auth/models.py:287 msgid "message" msgstr "mensaje" #: contrib/auth/forms.py:17 contrib/auth/forms.py:138 msgid "The two password fields didn't match." -msgstr "Las dos contraseas no coinciden." +msgstr "Las dos contraseñas no coinciden." #: contrib/auth/forms.py:25 msgid "A user with that username already exists." @@ -1085,32 +935,65 @@ msgid "" "Please enter a correct username and password. Note that both fields are case-" "sensitive." msgstr "" -"Por favor, introduzca un correcto nombre de usuario y contrasea. Note que " -"ambos campos son sensibles a maysculas/minsculas." +"Por favor, introduzca un correcto nombre de usuario y contraseña. Note que " +"ambos campos son sensibles a mayúsculas/minúsculas." #: contrib/auth/forms.py:62 msgid "This account is inactive." -msgstr "Esta cuenta est inactiva." +msgstr "Esta cuenta está inactiva." -#: contrib/auth/forms.py:85 +#: contrib/auth/forms.py:84 msgid "" "That e-mail address doesn't have an associated user account. Are you sure " "you've registered?" msgstr "" -"Esta direccin de correo electrnico no tiene una cuenta de usuario " -"asociada. Est seguro de que se ha registrado?" +"Esta dirección de correo electrónico no tiene una cuenta de usuario " +"asociada. ¿Está seguro de que se ha registrado?" #: contrib/auth/forms.py:117 msgid "The two 'new password' fields didn't match." -msgstr "Las contraseas introducidas en los campos 'nueva contrasea' no coinciden." +msgstr "" +"Las contraseñas introducidas en los campos 'nueva contraseña' no coinciden." #: contrib/auth/forms.py:124 msgid "Your old password was entered incorrectly. Please enter it again." msgstr "" -"Tu contrasea antigua es incorrecta. Por favor, vuelve a introducirla " +"Tu contraseña antigua es incorrecta. Por favor, vuelve a introducirla " "correctamente." -#: contrib/comments/models.py:67 contrib/comments/models.py:166 +#: contrib/redirects/models.py:7 +msgid "redirect from" +msgstr "redirigir desde" + +#: contrib/redirects/models.py:8 +msgid "" +"This should be an absolute path, excluding the domain name. Example: '/" +"events/search/'." +msgstr "" +"Esta ruta debería ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/" +"events/search/'." + +#: contrib/redirects/models.py:9 +msgid "redirect to" +msgstr "redirigir a" + +#: contrib/redirects/models.py:10 +msgid "" +"This can be either an absolute path (as above) or a full URL starting with " +"'http://'." +msgstr "" +"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que " +"empiece con 'http://'." + +#: contrib/redirects/models.py:13 +msgid "redirect" +msgstr "redirección" + +#: contrib/redirects/models.py:14 +msgid "redirects" +msgstr "redirecciones" + +#: contrib/comments/models.py:67 contrib/comments/models.py:169 msgid "object ID" msgstr "ID de objeto" @@ -1119,79 +1002,79 @@ msgid "headline" msgstr "encabezado" #: contrib/comments/models.py:69 contrib/comments/models.py:90 -#: contrib/comments/models.py:167 +#: contrib/comments/models.py:170 msgid "comment" msgstr "comentario" #: contrib/comments/models.py:70 msgid "rating #1" -msgstr "calificacin 1" +msgstr "calificación 1" #: contrib/comments/models.py:71 msgid "rating #2" -msgstr "calificacin 2" +msgstr "calificación 2" #: contrib/comments/models.py:72 msgid "rating #3" -msgstr "calificacin 3" +msgstr "calificación 3" #: contrib/comments/models.py:73 msgid "rating #4" -msgstr "calificacin 4" +msgstr "calificación 4" #: contrib/comments/models.py:74 msgid "rating #5" -msgstr "calificacin 5" +msgstr "calificación 5" #: contrib/comments/models.py:75 msgid "rating #6" -msgstr "calificacin 6" +msgstr "calificación 6" #: contrib/comments/models.py:76 msgid "rating #7" -msgstr "calificacin 7" +msgstr "calificación 7" #: contrib/comments/models.py:77 msgid "rating #8" -msgstr "calificacin 8" +msgstr "calificación 8" #: contrib/comments/models.py:82 msgid "is valid rating" -msgstr "es calificacin vlida" +msgstr "es calificación válida" -#: contrib/comments/models.py:83 contrib/comments/models.py:169 +#: contrib/comments/models.py:83 contrib/comments/models.py:172 msgid "date/time submitted" -msgstr "fecha/hora de envo" +msgstr "fecha/hora de envío" -#: contrib/comments/models.py:84 contrib/comments/models.py:170 +#: contrib/comments/models.py:84 contrib/comments/models.py:173 msgid "is public" -msgstr "es pblico" +msgstr "es público" -#: contrib/comments/models.py:85 contrib/admin/views/doc.py:307 +#: contrib/comments/models.py:85 contrib/admin/views/doc.py:306 msgid "IP address" -msgstr "Direccin IP" +msgstr "Dirección IP" #: contrib/comments/models.py:86 msgid "is removed" -msgstr "est eliminado" +msgstr "está eliminado" #: contrib/comments/models.py:86 msgid "" "Check this box if the comment is inappropriate. A \"This comment has been " "removed\" message will be displayed instead." msgstr "" -"Marque esta caja si el comentario es inapropiado. En su lugar se mostrar " +"Marque esta caja si el comentario es inapropiado. En su lugar se mostrará " "\"Este comentario ha sido eliminado\"." #: contrib/comments/models.py:91 msgid "comments" msgstr "comentarios" -#: contrib/comments/models.py:131 contrib/comments/models.py:207 +#: contrib/comments/models.py:134 contrib/comments/models.py:213 msgid "Content object" msgstr "Objeto contenido" -#: contrib/comments/models.py:159 +#: contrib/comments/models.py:162 #, python-format msgid "" "Posted by %(user)s at %(date)s\n" @@ -1206,48 +1089,48 @@ msgstr "" "\n" "http://%(domain)s%(url)s" -#: contrib/comments/models.py:168 +#: contrib/comments/models.py:171 msgid "person's name" msgstr "nombre de la persona" -#: contrib/comments/models.py:171 +#: contrib/comments/models.py:174 msgid "ip address" -msgstr "direccin ip" +msgstr "dirección ip" -#: contrib/comments/models.py:173 +#: contrib/comments/models.py:176 msgid "approved by staff" msgstr "aprobado por el staff" -#: contrib/comments/models.py:176 +#: contrib/comments/models.py:179 msgid "free comment" msgstr "comentario libre" -#: contrib/comments/models.py:177 +#: contrib/comments/models.py:180 msgid "free comments" msgstr "comentarios libres" -#: contrib/comments/models.py:233 +#: contrib/comments/models.py:239 msgid "score" -msgstr "puntuacin" +msgstr "puntuación" -#: contrib/comments/models.py:234 +#: contrib/comments/models.py:240 msgid "score date" -msgstr "fecha de la puntuacin" +msgstr "fecha de la puntuación" -#: contrib/comments/models.py:237 +#: contrib/comments/models.py:243 msgid "karma score" msgstr "punto karma" -#: contrib/comments/models.py:238 +#: contrib/comments/models.py:244 msgid "karma scores" msgstr "puntos karma" -#: contrib/comments/models.py:242 +#: contrib/comments/models.py:248 #, python-format msgid "%(score)d rating by %(user)s" msgstr "puntuado %(score)d por %(user)s" -#: contrib/comments/models.py:258 +#: contrib/comments/models.py:264 #, python-format msgid "" "This comment was flagged by %(user)s:\n" @@ -1258,53 +1141,121 @@ msgstr "" "\n" "%(text)s" -#: contrib/comments/models.py:265 +#: contrib/comments/models.py:271 msgid "flag date" msgstr "fecha de la marca" -#: contrib/comments/models.py:268 +#: contrib/comments/models.py:274 msgid "user flag" msgstr "marca de usuario" -#: contrib/comments/models.py:269 +#: contrib/comments/models.py:275 msgid "user flags" msgstr "marcas de usuario" -#: contrib/comments/models.py:273 +#: contrib/comments/models.py:279 #, python-format msgid "Flag by %r" msgstr "Marca de %r" -#: contrib/comments/models.py:278 +#: contrib/comments/models.py:284 msgid "deletion date" -msgstr "fecha de eliminacin" +msgstr "fecha de eliminación" -#: contrib/comments/models.py:280 +#: contrib/comments/models.py:286 msgid "moderator deletion" -msgstr "eliminacin de moderador" +msgstr "eliminación de moderador" -#: contrib/comments/models.py:281 +#: contrib/comments/models.py:287 msgid "moderator deletions" msgstr "eliminaciones de moderador" -#: contrib/comments/models.py:285 +#: contrib/comments/models.py:291 #, python-format msgid "Moderator deletion by %r" -msgstr "Eliminacin del moderador %r" +msgstr "Eliminación del moderador %r" -#: contrib/comments/templates/comments/freeform.html:4 -msgid "Your name:" -msgstr "Tu nombre:" +#: contrib/comments/views/karma.py:20 +msgid "Anonymous users cannot vote" +msgstr "Los usuarios anónimos no pueden votar" -#: contrib/comments/templates/comments/freeform.html:5 -#: contrib/comments/templates/comments/form.html:28 -msgid "Comment:" -msgstr "Comentario:" +#: contrib/comments/views/karma.py:24 +msgid "Invalid comment ID" +msgstr "ID de comentario no válido" -#: contrib/comments/templates/comments/freeform.html:10 -#: contrib/comments/templates/comments/form.html:35 -msgid "Preview comment" -msgstr "Previsualizar comentario" +#: contrib/comments/views/karma.py:26 +msgid "No voting for yourself" +msgstr "No puedes votarte tú mismo" + +#: contrib/comments/views/comments.py:28 +msgid "" +"This rating is required because you've entered at least one other rating." +msgstr "Se precisa esta puntuación porque ha introducido al menos otra más." + +#: contrib/comments/views/comments.py:112 +#, python-format +msgid "" +"This comment was posted by a user who has posted fewer than %(count)s " +"comment:\n" +"\n" +"%(text)s" +msgid_plural "" +"This comment was posted by a user who has posted fewer than %(count)s " +"comments:\n" +"\n" +"%(text)s" +msgstr[0] "" +"Este comentario lo envió un usuario que ha enviado menos de %(count)s " +"comentario:\n" +"\n" +"%(text)s" +msgstr[1] "" +"Este comentario lo envió un usuario que ha enviado menos de %(count)s " +"comentarios:\n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:117 +#, python-format +msgid "" +"This comment was posted by a sketchy user:\n" +"\n" +"%(text)s" +msgstr "" +"Este comentario ha sido colocado por un usuario poco preciso: \n" +"\n" +"%(text)s" + +#: contrib/comments/views/comments.py:189 +#: contrib/comments/views/comments.py:281 +msgid "Only POSTs are allowed" +msgstr "Sólo se admite POST" + +#: contrib/comments/views/comments.py:193 +#: contrib/comments/views/comments.py:285 +msgid "One or more of the required fields wasn't submitted" +msgstr "No se proporcionó uno o más de los siguientes campos requeridos" + +#: contrib/comments/views/comments.py:197 +#: contrib/comments/views/comments.py:287 +msgid "Somebody tampered with the comment form (security violation)" +msgstr "" +"Alguien está jugando con el formulario de comentarios (violación de " +"seguridad)" + +#: contrib/comments/views/comments.py:207 +#: contrib/comments/views/comments.py:293 +msgid "" +"The comment form had an invalid 'target' parameter -- the object ID was " +"invalid" +msgstr "" +"El formulario de comentarios tiene un parámetro 'target' no válido (el ID de " +"objeto era inválido)" + +#: contrib/comments/views/comments.py:258 +#: contrib/comments/views/comments.py:322 +msgid "The comment form didn't provide either 'preview' or 'post'" +msgstr "El formulario de comentario no proporcionó 'previsualizar' ni 'enviar'" #: contrib/comments/templates/comments/form.html:6 #: contrib/comments/templates/comments/form.html:8 @@ -1313,26 +1264,26 @@ msgid "Username:" msgstr "Usuario:" #: contrib/comments/templates/comments/form.html:6 -#: contrib/admin/templates/admin_doc/model_index.html:5 -#: contrib/admin/templates/admin_doc/model_detail.html:3 -#: contrib/admin/templates/admin_doc/view_detail.html:4 -#: contrib/admin/templates/admin_doc/view_index.html:5 -#: contrib/admin/templates/admin_doc/template_filter_index.html:5 -#: contrib/admin/templates/admin_doc/bookmarklets.html:4 -#: contrib/admin/templates/admin_doc/index.html:4 -#: contrib/admin/templates/admin_doc/missing_docutils.html:4 -#: contrib/admin/templates/admin_doc/template_tag_index.html:5 -#: contrib/admin/templates/admin_doc/template_detail.html:4 -#: contrib/admin/templates/admin/object_history.html:3 -#: contrib/admin/templates/admin/base.html:25 #: contrib/admin/templates/admin/change_list.html:5 -#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/object_history.html:3 #: contrib/admin/templates/admin/change_form.html:10 +#: contrib/admin/templates/admin/delete_confirmation.html:3 +#: contrib/admin/templates/admin/base.html:25 #: contrib/admin/templates/admin/auth/user/change_password.html:9 -#: contrib/admin/templates/registration/password_change_form.html:3 #: contrib/admin/templates/registration/password_change_done.html:3 +#: contrib/admin/templates/registration/password_change_form.html:3 +#: contrib/admin/templates/admin_doc/view_detail.html:4 +#: contrib/admin/templates/admin_doc/bookmarklets.html:4 +#: contrib/admin/templates/admin_doc/template_detail.html:4 +#: contrib/admin/templates/admin_doc/template_tag_index.html:5 +#: contrib/admin/templates/admin_doc/missing_docutils.html:4 +#: contrib/admin/templates/admin_doc/view_index.html:5 +#: contrib/admin/templates/admin_doc/model_detail.html:3 +#: contrib/admin/templates/admin_doc/index.html:4 +#: contrib/admin/templates/admin_doc/model_index.html:5 +#: contrib/admin/templates/admin_doc/template_filter_index.html:5 msgid "Log out" -msgstr "Terminar sesin" +msgstr "Terminar sesión" #: contrib/comments/templates/comments/form.html:8 #: contrib/admin/templates/admin/login.html:20 @@ -1341,7 +1292,7 @@ msgstr "Clave:" #: contrib/comments/templates/comments/form.html:8 msgid "Forgotten your password?" -msgstr "Has olvidado tu contrasea?" +msgstr "¿Has olvidado tu contraseña?" #: contrib/comments/templates/comments/form.html:12 msgid "Ratings" @@ -1359,138 +1310,110 @@ msgstr "Opcional" #: contrib/comments/templates/comments/form.html:23 msgid "Post a photo" -msgstr "Postea una fotografa" +msgstr "Postea una fotografía" -#: contrib/comments/views/comments.py:27 -msgid "This rating is required because you've entered at least one other rating." -msgstr "Se precisa esta puntuacin porque ha introducido al menos otra ms." +#: contrib/comments/templates/comments/form.html:28 +#: contrib/comments/templates/comments/freeform.html:5 +msgid "Comment:" +msgstr "Comentario:" -#: contrib/comments/views/comments.py:111 -#, python-format +#: contrib/comments/templates/comments/form.html:35 +#: contrib/comments/templates/comments/freeform.html:10 +msgid "Preview comment" +msgstr "Previsualizar comentario" + +#: contrib/comments/templates/comments/freeform.html:4 +msgid "Your name:" +msgstr "Tu nombre:" + +#: contrib/flatpages/models.py:7 contrib/admin/views/doc.py:317 +msgid "URL" +msgstr "URL" + +#: contrib/flatpages/models.py:8 msgid "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comment:\n" -"\n" -"%(text)s" -msgid_plural "" -"This comment was posted by a user who has posted fewer than %(count)s " -"comments:\n" -"\n" -"%(text)s" -msgstr[0] "" -"Este comentario lo envi un usuario que ha enviado menos de %(count)s " -"comentario:\n" -"\n" -"%(text)s" -msgstr[1] "" -"Este comentario lo envi un usuario que ha enviado menos de %(count)s " -"comentarios:\n" -"\n" -"%(text)s" +"Example: '/about/contact/'. Make sure to have leading and trailing slashes." +msgstr "" +"Ejemplo: '/about/contact/'. Asegúrese de que pone barras al principio y al " +"final." -#: contrib/comments/views/comments.py:116 -#, python-format +#: contrib/flatpages/models.py:9 +msgid "title" +msgstr "título" + +#: contrib/flatpages/models.py:10 +msgid "content" +msgstr "contenido" + +#: contrib/flatpages/models.py:11 +msgid "enable comments" +msgstr "admitir comentarios" + +#: contrib/flatpages/models.py:12 +msgid "template name" +msgstr "nombre de plantilla" + +#: contrib/flatpages/models.py:13 msgid "" -"This comment was posted by a sketchy user:\n" -"\n" -"%(text)s" +"Example: 'flatpages/contact_page.html'. If this isn't provided, the system " +"will use 'flatpages/default.html'." msgstr "" -"Este comentario ha sido colocado por un usuario poco preciso: \n" -"\n" -"%(text)s" +"Ejemplo: 'flatpages/contact_page.html'. Si no es proporcionado, el sistema " +"usará 'flatpages/default.html'." -#: contrib/comments/views/comments.py:188 -#: contrib/comments/views/comments.py:280 -msgid "Only POSTs are allowed" -msgstr "Slo se admite POST" +#: contrib/flatpages/models.py:14 +msgid "registration required" +msgstr "debe estar registrado" -#: contrib/comments/views/comments.py:192 -#: contrib/comments/views/comments.py:284 -msgid "One or more of the required fields wasn't submitted" -msgstr "No se proporcion uno o ms de los siguientes campos requeridos" +#: contrib/flatpages/models.py:14 +msgid "If this is checked, only logged-in users will be able to view the page." +msgstr "Si está marcado, sólo los usuarios registrados podrán ver la página." -#: contrib/comments/views/comments.py:196 -#: contrib/comments/views/comments.py:286 -msgid "Somebody tampered with the comment form (security violation)" -msgstr "" -"Alguien est jugando con el formulario de comentarios (violacin de " -"seguridad)" +#: contrib/flatpages/models.py:18 +msgid "flat page" +msgstr "página estática" -#: contrib/comments/views/comments.py:206 -#: contrib/comments/views/comments.py:292 -msgid "" -"The comment form had an invalid 'target' parameter -- the object ID was " -"invalid" -msgstr "" -"El formulario de comentarios tiene un parmetro 'target' no vlido (el ID de " -"objeto era invlido)" +#: contrib/flatpages/models.py:19 +msgid "flat pages" +msgstr "páginas estáticas" -#: contrib/comments/views/comments.py:257 -#: contrib/comments/views/comments.py:321 -msgid "The comment form didn't provide either 'preview' or 'post'" -msgstr "El formulario de comentario no proporcion 'previsualizar' ni 'enviar'" +#: contrib/sessions/models.py:68 +msgid "session key" +msgstr "clave de sesión" -#: contrib/comments/views/karma.py:19 -msgid "Anonymous users cannot vote" -msgstr "Los usuarios annimos no pueden votar" +#: contrib/sessions/models.py:69 +msgid "session data" +msgstr "datos de sesión" -#: contrib/comments/views/karma.py:23 -msgid "Invalid comment ID" -msgstr "ID de comentario no vlido" +#: contrib/sessions/models.py:70 +msgid "expire date" +msgstr "fecha de caducidad" -#: contrib/comments/views/karma.py:25 -msgid "No voting for yourself" -msgstr "No puedes votarte t mismo" +#: contrib/sessions/models.py:74 +msgid "session" +msgstr "sesión" -#: contrib/redirects/models.py:7 -msgid "redirect from" -msgstr "redirigir desde" +#: contrib/sessions/models.py:75 +msgid "sessions" +msgstr "sesiones" -#: contrib/redirects/models.py:8 -msgid "" -"This should be an absolute path, excluding the domain name. Example: '/" -"events/search/'." -msgstr "" -"Esta ruta debera ser absoluta, excluyendo el nombre de dominio. Ejeplo: '/" -"events/search/'." - -#: contrib/redirects/models.py:9 -msgid "redirect to" -msgstr "redirigir a" - -#: contrib/redirects/models.py:10 -msgid "" -"This can be either an absolute path (as above) or a full URL starting with " -"'http://'." -msgstr "" -"Esto puede ser bien una ruta absoluta (como antes) o una URL completa que " -"empiece con 'http://'." - -#: contrib/redirects/models.py:13 -msgid "redirect" -msgstr "redireccin" - -#: contrib/redirects/models.py:14 -msgid "redirects" -msgstr "redirecciones" - -#: contrib/sites/models.py:10 +#: contrib/sites/models.py:15 msgid "domain name" msgstr "nombre de dominio" -#: contrib/sites/models.py:11 +#: contrib/sites/models.py:16 msgid "display name" msgstr "nombre para mostrar" -#: contrib/sites/models.py:15 +#: contrib/sites/models.py:20 msgid "site" msgstr "sitio" -#: contrib/sites/models.py:16 +#: contrib/sites/models.py:21 msgid "sites" msgstr "sitios" -#: contrib/admin/filterspecs.py:40 +#: contrib/admin/filterspecs.py:42 #, python-format msgid "" "

      By %s:

      \n" @@ -1499,59 +1422,338 @@ msgstr "" "

      Por %s:

      \n" "