From b403e43c5164d07af88e924a5fdbd3f051c6cb9e Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Mon, 5 Mar 2012 02:23:17 +0000 Subject: [PATCH] Updated core base translation files with new strings. Refs #17822. git-svn-id: http://code.djangoproject.com/svn/django/trunk@17655 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/locale/en/LC_MESSAGES/django.mo | Bin 557 -> 356 bytes django/conf/locale/en/LC_MESSAGES/django.po | 186 ++++++++++++-------- django/views/static.py | 2 +- 3 files changed, 112 insertions(+), 76 deletions(-) diff --git a/django/conf/locale/en/LC_MESSAGES/django.mo b/django/conf/locale/en/LC_MESSAGES/django.mo index 5431e4a132b559ea241cc3af7c35b4b838cb4404..ab866971b3465e6639bc58690d37be036afdea9c 100644 GIT binary patch delta 99 zcmZ3>@`TCao)F7a1|VPrVi_P-0b*t#)&XJ=umEB$prj>`2C0F8iJv`rjdTr+bq!1v f42-OdOeT9W=JEI>=B1Y=rl(pdq~=ZD#ux(tTA&aF delta 312 zcmaFDw3em*o)F7a1|VPqVi_Rz0b*_-t^r~YSOLWRK)e!&LE<}sSOAERLiyK#v>*^a z0%BQ428J&{niGhHn4o3?X=Wf_8At=A8PuVCO$fi9fdwcCWTOC9AP=Mo1V9c00~f~- z*AP!%*LXMoAYaE21`r>{_VxD*@rZYEjD!gwD~xn?42p-SfNBjW%FjwoF46T&ndofC vYp82rtZQVTU}RurYCf?qZ!#xiw6vc>mX1QCjzRzfgvH>dki`%HBqJFBka;j+ diff --git a/django/conf/locale/en/LC_MESSAGES/django.po b/django/conf/locale/en/LC_MESSAGES/django.po index abb52ae27f7..f1719efc6bb 100644 --- a/django/conf/locale/en/LC_MESSAGES/django.po +++ b/django/conf/locale/en/LC_MESSAGES/django.po @@ -4,7 +4,7 @@ msgid "" msgstr "" "Project-Id-Version: Django\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-12-22 23:56+0100\n" +"POT-Creation-Date: 2012-03-05 02:24+0100\n" "PO-Revision-Date: 2010-05-13 15:35+0200\n" "Last-Translator: Django team\n" "Language-Team: English \n" @@ -289,70 +289,70 @@ msgstr "" msgid "Enter a valid URL." msgstr "" -#: core/validators.py:164 forms/fields.py:474 +#: core/validators.py:165 forms/fields.py:474 msgid "Enter a valid e-mail address." msgstr "" -#: core/validators.py:167 forms/fields.py:1022 +#: core/validators.py:168 forms/fields.py:1023 msgid "" "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." msgstr "" -#: core/validators.py:170 core/validators.py:187 forms/fields.py:996 +#: core/validators.py:171 core/validators.py:188 forms/fields.py:997 msgid "Enter a valid IPv4 address." msgstr "" -#: core/validators.py:174 core/validators.py:188 +#: core/validators.py:175 core/validators.py:189 msgid "Enter a valid IPv6 address." msgstr "" -#: core/validators.py:183 core/validators.py:186 +#: core/validators.py:184 core/validators.py:187 msgid "Enter a valid IPv4 or IPv6 address." msgstr "" -#: core/validators.py:208 db/models/fields/__init__.py:636 +#: core/validators.py:209 db/models/fields/__init__.py:638 msgid "Enter only digits separated by commas." msgstr "" -#: core/validators.py:214 +#: core/validators.py:215 #, python-format msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgstr "" -#: core/validators.py:232 forms/fields.py:209 forms/fields.py:262 +#: core/validators.py:233 forms/fields.py:209 forms/fields.py:262 #, python-format msgid "Ensure this value is less than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:237 forms/fields.py:210 forms/fields.py:263 +#: core/validators.py:238 forms/fields.py:210 forms/fields.py:263 #, python-format msgid "Ensure this value is greater than or equal to %(limit_value)s." msgstr "" -#: core/validators.py:243 +#: core/validators.py:244 #, python-format msgid "" "Ensure this value has at least %(limit_value)d characters (it has " "%(show_value)d)." msgstr "" -#: core/validators.py:249 +#: core/validators.py:250 #, python-format msgid "" "Ensure this value has at most %(limit_value)d characters (it has " "%(show_value)d)." msgstr "" -#: db/models/base.py:765 +#: db/models/base.py:770 #, python-format msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." msgstr "" -#: db/models/base.py:788 forms/models.py:570 +#: db/models/base.py:793 forms/models.py:577 msgid "and" msgstr "" -#: db/models/base.py:789 db/models/fields/__init__.py:65 +#: db/models/base.py:794 db/models/fields/__init__.py:65 #, python-format msgid "%(model_name)s with this %(field_label)s already exists." msgstr "" @@ -375,159 +375,181 @@ msgstr "" msgid "Field of type: %(field_type)s" msgstr "" -#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:948 -#: db/models/fields/__init__.py:1103 db/models/fields/__init__.py:1114 -#: db/models/fields/__init__.py:1141 +#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961 msgid "Integer" msgstr "" -#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:946 +#: db/models/fields/__init__.py:510 db/models/fields/__init__.py:959 #, python-format msgid "'%s' value must be an integer." msgstr "" -#: db/models/fields/__init__.py:551 +#: db/models/fields/__init__.py:552 #, python-format msgid "'%s' value must be either True or False." msgstr "" -#: db/models/fields/__init__.py:553 +#: db/models/fields/__init__.py:554 msgid "Boolean (Either True or False)" msgstr "" -#: db/models/fields/__init__.py:603 db/models/fields/__init__.py:1124 +#: db/models/fields/__init__.py:605 #, python-format msgid "String (up to %(max_length)s)" msgstr "" -#: db/models/fields/__init__.py:631 +#: db/models/fields/__init__.py:633 msgid "Comma-separated integers" msgstr "" -#: db/models/fields/__init__.py:645 +#: db/models/fields/__init__.py:647 #, python-format msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format." msgstr "" -#: db/models/fields/__init__.py:647 db/models/fields/__init__.py:732 +#: db/models/fields/__init__.py:649 db/models/fields/__init__.py:734 #, python-format msgid "" "'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date." msgstr "" -#: db/models/fields/__init__.py:650 +#: db/models/fields/__init__.py:652 msgid "Date (without time)" msgstr "" -#: db/models/fields/__init__.py:730 +#: db/models/fields/__init__.py:732 #, python-format msgid "" "'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "uuuuuu]][TZ] format." msgstr "" -#: db/models/fields/__init__.py:734 +#: db/models/fields/__init__.py:736 #, python-format msgid "" "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but " "it is an invalid date/time." msgstr "" -#: db/models/fields/__init__.py:738 +#: db/models/fields/__init__.py:740 msgid "Date (with time)" msgstr "" -#: db/models/fields/__init__.py:818 +#: db/models/fields/__init__.py:831 #, python-format msgid "'%s' value must be a decimal number." msgstr "" -#: db/models/fields/__init__.py:820 +#: db/models/fields/__init__.py:833 msgid "Decimal number" msgstr "" -#: db/models/fields/__init__.py:877 +#: db/models/fields/__init__.py:890 msgid "E-mail address" msgstr "" -#: db/models/fields/__init__.py:893 db/models/fields/files.py:214 -#: db/models/fields/files.py:321 +#: db/models/fields/__init__.py:906 msgid "File path" msgstr "" -#: db/models/fields/__init__.py:917 +#: db/models/fields/__init__.py:930 #, python-format msgid "'%s' value must be a float." msgstr "" -#: db/models/fields/__init__.py:919 +#: db/models/fields/__init__.py:932 msgid "Floating point number" msgstr "" -#: db/models/fields/__init__.py:980 +#: db/models/fields/__init__.py:993 msgid "Big (8 byte) integer" msgstr "" -#: db/models/fields/__init__.py:994 +#: db/models/fields/__init__.py:1007 msgid "IPv4 address" msgstr "" -#: db/models/fields/__init__.py:1010 +#: db/models/fields/__init__.py:1023 msgid "IP address" msgstr "" -#: db/models/fields/__init__.py:1052 +#: db/models/fields/__init__.py:1065 #, python-format msgid "'%s' value must be either None, True or False." msgstr "" -#: db/models/fields/__init__.py:1054 +#: db/models/fields/__init__.py:1067 msgid "Boolean (Either True, False or None)" msgstr "" -#: db/models/fields/__init__.py:1147 +#: db/models/fields/__init__.py:1116 +msgid "Positive integer" +msgstr "" + +#: db/models/fields/__init__.py:1127 +msgid "Positive small integer" +msgstr "" + +#: db/models/fields/__init__.py:1138 +#, python-format +msgid "Slug (up to %(max_length)s)" +msgstr "" + +#: db/models/fields/__init__.py:1156 +msgid "Small integer" +msgstr "" + +#: db/models/fields/__init__.py:1162 msgid "Text" msgstr "" -#: db/models/fields/__init__.py:1165 +#: db/models/fields/__init__.py:1180 #, python-format msgid "" "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." msgstr "" -#: db/models/fields/__init__.py:1167 +#: db/models/fields/__init__.py:1182 #, python-format msgid "" "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid " "time." msgstr "" -#: db/models/fields/__init__.py:1170 +#: db/models/fields/__init__.py:1185 msgid "Time" msgstr "" -#: db/models/fields/__init__.py:1234 +#: db/models/fields/__init__.py:1249 msgid "URL" msgstr "" -#: db/models/fields/related.py:902 +#: db/models/fields/files.py:214 +msgid "File" +msgstr "" + +#: db/models/fields/files.py:321 +msgid "Image" +msgstr "" + +#: db/models/fields/related.py:903 #, python-format msgid "Model %(model)s with pk %(pk)r does not exist." msgstr "" -#: db/models/fields/related.py:904 +#: db/models/fields/related.py:905 msgid "Foreign Key (type determined by related field)" msgstr "" -#: db/models/fields/related.py:1032 +#: db/models/fields/related.py:1033 msgid "One-to-one relationship" msgstr "" -#: db/models/fields/related.py:1095 +#: db/models/fields/related.py:1096 msgid "Many-to-many relationship" msgstr "" -#: db/models/fields/related.py:1119 +#: db/models/fields/related.py:1120 msgid "" "Hold down \"Control\", or \"Command\" on a Mac, to select more than one." msgstr "" @@ -559,11 +581,11 @@ msgstr "" msgid "Ensure that there are no more than %s digits before the decimal point." msgstr "" -#: forms/fields.py:365 forms/fields.py:962 +#: forms/fields.py:365 forms/fields.py:963 msgid "Enter a valid date." msgstr "" -#: forms/fields.py:388 forms/fields.py:963 +#: forms/fields.py:388 forms/fields.py:964 msgid "Enter a valid time." msgstr "" @@ -604,7 +626,7 @@ msgstr "" msgid "Select a valid choice. %(value)s is not one of the available choices." msgstr "" -#: forms/fields.py:770 forms/fields.py:858 forms/models.py:992 +#: forms/fields.py:770 forms/fields.py:858 forms/models.py:999 msgid "Enter a list of values." msgstr "" @@ -616,41 +638,41 @@ msgstr "" msgid "Delete" msgstr "" -#: forms/models.py:564 +#: forms/models.py:571 #, python-format msgid "Please correct the duplicate data for %(field)s." msgstr "" -#: forms/models.py:568 +#: forms/models.py:575 #, python-format msgid "Please correct the duplicate data for %(field)s, which must be unique." msgstr "" -#: forms/models.py:574 +#: forms/models.py:581 #, python-format msgid "" "Please correct the duplicate data for %(field_name)s which must be unique " "for the %(lookup)s in %(date_field)s." msgstr "" -#: forms/models.py:582 +#: forms/models.py:589 msgid "Please correct the duplicate values below." msgstr "" -#: forms/models.py:842 +#: forms/models.py:849 msgid "The inline foreign key did not match the parent instance primary key." msgstr "" -#: forms/models.py:903 +#: forms/models.py:910 msgid "Select a valid choice. That choice is not one of the available choices." msgstr "" -#: forms/models.py:993 +#: forms/models.py:1000 #, python-format msgid "Select a valid choice. %s is not one of the available choices." msgstr "" -#: forms/models.py:995 +#: forms/models.py:1002 #, python-format msgid "\"%s\" is not a valid value for a primary key." msgstr "" @@ -662,62 +684,62 @@ msgid "" "may be ambiguous or it may not exist." msgstr "" -#: forms/widgets.py:326 +#: forms/widgets.py:325 msgid "Currently" msgstr "" -#: forms/widgets.py:327 +#: forms/widgets.py:326 msgid "Change" msgstr "" -#: forms/widgets.py:328 +#: forms/widgets.py:327 msgid "Clear" msgstr "" -#: forms/widgets.py:583 +#: forms/widgets.py:582 msgid "Unknown" msgstr "" -#: forms/widgets.py:584 +#: forms/widgets.py:583 msgid "Yes" msgstr "" -#: forms/widgets.py:585 +#: forms/widgets.py:584 msgid "No" msgstr "" -#: template/defaultfilters.py:785 +#: template/defaultfilters.py:797 msgid "yes,no,maybe" msgstr "" -#: template/defaultfilters.py:813 template/defaultfilters.py:818 +#: template/defaultfilters.py:825 template/defaultfilters.py:830 #, python-format msgid "%(size)d byte" msgid_plural "%(size)d bytes" msgstr[0] "" msgstr[1] "" -#: template/defaultfilters.py:820 +#: template/defaultfilters.py:832 #, python-format msgid "%s KB" msgstr "" -#: template/defaultfilters.py:822 +#: template/defaultfilters.py:834 #, python-format msgid "%s MB" msgstr "" -#: template/defaultfilters.py:824 +#: template/defaultfilters.py:836 #, python-format msgid "%s GB" msgstr "" -#: template/defaultfilters.py:826 +#: template/defaultfilters.py:838 #, python-format msgid "%s TB" msgstr "" -#: template/defaultfilters.py:827 +#: template/defaultfilters.py:839 #, python-format msgid "%s PB" msgstr "" @@ -1083,6 +1105,20 @@ msgstr "" msgid ", %(number)d %(type)s" msgstr "" +#: views/static.py:52 +msgid "Directory indexes are not allowed here." +msgstr "" + +#: views/static.py:54 +#, python-format +msgid "\"%(path)s\" does not exist" +msgstr "" + +#: views/static.py:95 +#, python-format +msgid "Index of %(directory)s" +msgstr "" + #: views/generic/create_update.py:121 #, python-format msgid "The %(verbose_name)s was created successfully." diff --git a/django/views/static.py b/django/views/static.py index f2279802fc7..ed237793e4c 100644 --- a/django/views/static.py +++ b/django/views/static.py @@ -51,7 +51,7 @@ def serve(request, path, document_root=None, show_indexes=False): return directory_index(newpath, fullpath) raise Http404(_(u"Directory indexes are not allowed here.")) if not os.path.exists(fullpath): - raise Http404(_(u'"%s" does not exist') % fullpath) + raise Http404(_(u'"%(path)s" does not exist') % {'path': fullpath}) # Respect the If-Modified-Since header. statobj = os.stat(fullpath) mimetype, encoding = mimetypes.guess_type(fullpath)