mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-30 17:16:10 +00:00
Code Issues 32 Releases Wiki Activity

Updated core base translation files with new strings. Refs #17822.

Browse Source 
git-svn-id: http://code.djangoproject.com/svn/django/trunk@17655 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Jannis Leidel
2012-03-05 02:23:17 +00:00
parent a78e61b5e9
commit b403e43c51
3 changed files with 112 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
django/conf/locale/en/LC_MESSAGES/django.mo
View File

Binary file not shown.

186
django/conf/locale/en/LC_MESSAGES/django.po
View File

@@ -4,7 +4,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Django\n" "Project-Id-Version: Django\n"
"Report-Msgid-Bugs-To: \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" "PO-Revision-Date: 2010-05-13 15:35+0200\n"
"Last-Translator: Django team\n" "Last-Translator: Django team\n"
"Language-Team: English <en@li.org>\n" "Language-Team: English <en@li.org>\n"
@@ -289,70 +289,70 @@ msgstr ""
msgid "Enter a valid URL." msgid "Enter a valid URL."
msgstr "" msgstr ""
#: core/validators.py:164 forms/fields.py:474 #: core/validators.py:165 forms/fields.py:474
msgid "Enter a valid e-mail address." msgid "Enter a valid e-mail address."
msgstr "" msgstr ""
#: core/validators.py:167 forms/fields.py:1022 #: core/validators.py:168 forms/fields.py:1023
msgid "" msgid ""
"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." "Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens."
msgstr "" 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." msgid "Enter a valid IPv4 address."
msgstr "" msgstr ""
#: core/validators.py:174 core/validators.py:188 #: core/validators.py:175 core/validators.py:189
msgid "Enter a valid IPv6 address." msgid "Enter a valid IPv6 address."
msgstr "" 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." msgid "Enter a valid IPv4 or IPv6 address."
msgstr "" 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." msgid "Enter only digits separated by commas."
msgstr "" msgstr ""
#: core/validators.py:214 #: core/validators.py:215
#, python-format #, python-format
msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)."
msgstr "" 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 #, python-format
msgid "Ensure this value is less than or equal to %(limit_value)s." msgid "Ensure this value is less than or equal to %(limit_value)s."
msgstr "" 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 #, python-format
msgid "Ensure this value is greater than or equal to %(limit_value)s." msgid "Ensure this value is greater than or equal to %(limit_value)s."
msgstr "" msgstr ""
#: core/validators.py:243 #: core/validators.py:244
#, python-format #, python-format
msgid "" msgid ""
"Ensure this value has at least %(limit_value)d characters (it has " "Ensure this value has at least %(limit_value)d characters (it has "
"%(show_value)d)." "%(show_value)d)."
msgstr "" msgstr ""
#: core/validators.py:249 #: core/validators.py:250
#, python-format #, python-format
msgid "" msgid ""
"Ensure this value has at most %(limit_value)d characters (it has " "Ensure this value has at most %(limit_value)d characters (it has "
"%(show_value)d)." "%(show_value)d)."
msgstr "" msgstr ""
#: db/models/base.py:765 #: db/models/base.py:770
#, python-format #, python-format
msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s." msgid "%(field_name)s must be unique for %(date_field)s %(lookup)s."
msgstr "" msgstr ""
#: db/models/base.py:788 forms/models.py:570 #: db/models/base.py:793 forms/models.py:577
msgid "and" msgid "and"
msgstr "" 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 #, python-format
msgid "%(model_name)s with this %(field_label)s already exists." msgid "%(model_name)s with this %(field_label)s already exists."
msgstr "" msgstr ""
@@ -375,159 +375,181 @@ msgstr ""
msgid "Field of type: %(field_type)s" msgid "Field of type: %(field_type)s"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:506 db/models/fields/__init__.py:948 #: db/models/fields/__init__.py:506 db/models/fields/__init__.py:961
#: db/models/fields/__init__.py:1103 db/models/fields/__init__.py:1114
#: db/models/fields/__init__.py:1141
msgid "Integer" msgid "Integer"
msgstr "" 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 #, python-format
msgid "'%s' value must be an integer." msgid "'%s' value must be an integer."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:551 #: db/models/fields/__init__.py:552
#, python-format #, python-format
msgid "'%s' value must be either True or False." msgid "'%s' value must be either True or False."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:553 #: db/models/fields/__init__.py:554
msgid "Boolean (Either True or False)" msgid "Boolean (Either True or False)"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:603 db/models/fields/__init__.py:1124 #: db/models/fields/__init__.py:605
#, python-format #, python-format
msgid "String (up to %(max_length)s)" msgid "String (up to %(max_length)s)"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:631 #: db/models/fields/__init__.py:633
msgid "Comma-separated integers" msgid "Comma-separated integers"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:645 #: db/models/fields/__init__.py:647
#, python-format #, python-format
msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format." msgid "'%s' value has an invalid date format. It must be in YYYY-MM-DD format."
msgstr "" 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 #, python-format
msgid "" msgid ""
"'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date." "'%s' value has the correct format (YYYY-MM-DD) but it is an invalid date."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:650 #: db/models/fields/__init__.py:652
msgid "Date (without time)" msgid "Date (without time)"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:730 #: db/models/fields/__init__.py:732
#, python-format #, python-format
msgid "" msgid ""
"'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." "'%s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[."
"uuuuuu]][TZ] format." "uuuuuu]][TZ] format."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:734 #: db/models/fields/__init__.py:736
#, python-format #, python-format
msgid "" msgid ""
"'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but " "'%s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]][TZ]) but "
"it is an invalid date/time." "it is an invalid date/time."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:738 #: db/models/fields/__init__.py:740
msgid "Date (with time)" msgid "Date (with time)"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:818 #: db/models/fields/__init__.py:831
#, python-format #, python-format
msgid "'%s' value must be a decimal number." msgid "'%s' value must be a decimal number."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:820 #: db/models/fields/__init__.py:833
msgid "Decimal number" msgid "Decimal number"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:877 #: db/models/fields/__init__.py:890
msgid "E-mail address" msgid "E-mail address"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:893 db/models/fields/files.py:214 #: db/models/fields/__init__.py:906
#: db/models/fields/files.py:321
msgid "File path" msgid "File path"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:917 #: db/models/fields/__init__.py:930
#, python-format #, python-format
msgid "'%s' value must be a float." msgid "'%s' value must be a float."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:919 #: db/models/fields/__init__.py:932
msgid "Floating point number" msgid "Floating point number"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:980 #: db/models/fields/__init__.py:993
msgid "Big (8 byte) integer" msgid "Big (8 byte) integer"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:994 #: db/models/fields/__init__.py:1007
msgid "IPv4 address" msgid "IPv4 address"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1010 #: db/models/fields/__init__.py:1023
msgid "IP address" msgid "IP address"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1052 #: db/models/fields/__init__.py:1065
#, python-format #, python-format
msgid "'%s' value must be either None, True or False." msgid "'%s' value must be either None, True or False."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1054 #: db/models/fields/__init__.py:1067
msgid "Boolean (Either True, False or None)" msgid "Boolean (Either True, False or None)"
msgstr "" 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" msgid "Text"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1165 #: db/models/fields/__init__.py:1180
#, python-format #, python-format
msgid "" msgid ""
"'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format." "'%s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] format."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1167 #: db/models/fields/__init__.py:1182
#, python-format #, python-format
msgid "" msgid ""
"'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid " "'%s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an invalid "
"time." "time."
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1170 #: db/models/fields/__init__.py:1185
msgid "Time" msgid "Time"
msgstr "" msgstr ""
#: db/models/fields/__init__.py:1234 #: db/models/fields/__init__.py:1249
msgid "URL" msgid "URL"
msgstr "" 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 #, python-format
msgid "Model %(model)s with pk %(pk)r does not exist." msgid "Model %(model)s with pk %(pk)r does not exist."
msgstr "" msgstr ""
#: db/models/fields/related.py:904 #: db/models/fields/related.py:905
msgid "Foreign Key (type determined by related field)" msgid "Foreign Key (type determined by related field)"
msgstr "" msgstr ""
#: db/models/fields/related.py:1032 #: db/models/fields/related.py:1033
msgid "One-to-one relationship" msgid "One-to-one relationship"
msgstr "" msgstr ""
#: db/models/fields/related.py:1095 #: db/models/fields/related.py:1096
msgid "Many-to-many relationship" msgid "Many-to-many relationship"
msgstr "" msgstr ""
#: db/models/fields/related.py:1119 #: db/models/fields/related.py:1120
msgid "" msgid ""
"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." "Hold down \"Control\", or \"Command\" on a Mac, to select more than one."
msgstr "" msgstr ""
@@ -559,11 +581,11 @@ msgstr ""
msgid "Ensure that there are no more than %s digits before the decimal point." msgid "Ensure that there are no more than %s digits before the decimal point."
msgstr "" msgstr ""
#: forms/fields.py:365 forms/fields.py:962 #: forms/fields.py:365 forms/fields.py:963
msgid "Enter a valid date." msgid "Enter a valid date."
msgstr "" msgstr ""
#: forms/fields.py:388 forms/fields.py:963 #: forms/fields.py:388 forms/fields.py:964
msgid "Enter a valid time." msgid "Enter a valid time."
msgstr "" msgstr ""
@@ -604,7 +626,7 @@ msgstr ""
msgid "Select a valid choice. %(value)s is not one of the available choices." msgid "Select a valid choice. %(value)s is not one of the available choices."
msgstr "" 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." msgid "Enter a list of values."
msgstr "" msgstr ""
@@ -616,41 +638,41 @@ msgstr ""
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: forms/models.py:564 #: forms/models.py:571
#, python-format #, python-format
msgid "Please correct the duplicate data for %(field)s." msgid "Please correct the duplicate data for %(field)s."
msgstr "" msgstr ""
#: forms/models.py:568 #: forms/models.py:575
#, python-format #, python-format
msgid "Please correct the duplicate data for %(field)s, which must be unique." msgid "Please correct the duplicate data for %(field)s, which must be unique."
msgstr "" msgstr ""
#: forms/models.py:574 #: forms/models.py:581
#, python-format #, python-format
msgid "" msgid ""
"Please correct the duplicate data for %(field_name)s which must be unique " "Please correct the duplicate data for %(field_name)s which must be unique "
"for the %(lookup)s in %(date_field)s." "for the %(lookup)s in %(date_field)s."
msgstr "" msgstr ""
#: forms/models.py:582 #: forms/models.py:589
msgid "Please correct the duplicate values below." msgid "Please correct the duplicate values below."
msgstr "" msgstr ""
#: forms/models.py:842 #: forms/models.py:849
msgid "The inline foreign key did not match the parent instance primary key." msgid "The inline foreign key did not match the parent instance primary key."
msgstr "" msgstr ""
#: forms/models.py:903 #: forms/models.py:910
msgid "Select a valid choice. That choice is not one of the available choices." msgid "Select a valid choice. That choice is not one of the available choices."
msgstr "" msgstr ""
#: forms/models.py:993 #: forms/models.py:1000
#, python-format #, python-format
msgid "Select a valid choice. %s is not one of the available choices." msgid "Select a valid choice. %s is not one of the available choices."
msgstr "" msgstr ""
#: forms/models.py:995 #: forms/models.py:1002
#, python-format #, python-format
msgid "\"%s\" is not a valid value for a primary key." msgid "\"%s\" is not a valid value for a primary key."
msgstr "" msgstr ""
@@ -662,62 +684,62 @@ msgid ""
"may be ambiguous or it may not exist." "may be ambiguous or it may not exist."
msgstr "" msgstr ""
#: forms/widgets.py:326 #: forms/widgets.py:325
msgid "Currently" msgid "Currently"
msgstr "" msgstr ""
#: forms/widgets.py:327 #: forms/widgets.py:326
msgid "Change" msgid "Change"
msgstr "" msgstr ""
#: forms/widgets.py:328 #: forms/widgets.py:327
msgid "Clear" msgid "Clear"
msgstr "" msgstr ""
#: forms/widgets.py:583 #: forms/widgets.py:582
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
#: forms/widgets.py:584 #: forms/widgets.py:583
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: forms/widgets.py:585 #: forms/widgets.py:584
msgid "No" msgid "No"
msgstr "" msgstr ""
#: template/defaultfilters.py:785 #: template/defaultfilters.py:797
msgid "yes,no,maybe" msgid "yes,no,maybe"
msgstr "" msgstr ""
#: template/defaultfilters.py:813 template/defaultfilters.py:818 #: template/defaultfilters.py:825 template/defaultfilters.py:830
#, python-format #, python-format
msgid "%(size)d byte" msgid "%(size)d byte"
msgid_plural "%(size)d bytes" msgid_plural "%(size)d bytes"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: template/defaultfilters.py:820 #: template/defaultfilters.py:832
#, python-format #, python-format
msgid "%s KB" msgid "%s KB"
msgstr "" msgstr ""
#: template/defaultfilters.py:822 #: template/defaultfilters.py:834
#, python-format #, python-format
msgid "%s MB" msgid "%s MB"
msgstr "" msgstr ""
#: template/defaultfilters.py:824 #: template/defaultfilters.py:836
#, python-format #, python-format
msgid "%s GB" msgid "%s GB"
msgstr "" msgstr ""
#: template/defaultfilters.py:826 #: template/defaultfilters.py:838
#, python-format #, python-format
msgid "%s TB" msgid "%s TB"
msgstr "" msgstr ""
#: template/defaultfilters.py:827 #: template/defaultfilters.py:839
#, python-format #, python-format
msgid "%s PB" msgid "%s PB"
msgstr "" msgstr ""
@@ -1083,6 +1105,20 @@ msgstr ""
msgid ", %(number)d %(type)s" msgid ", %(number)d %(type)s"
msgstr "" 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 #: views/generic/create_update.py:121
#, python-format #, python-format
msgid "The %(verbose_name)s was created successfully." msgid "The %(verbose_name)s was created successfully."

2
django/views/static.py
View File

@@ -51,7 +51,7 @@ def serve(request, path, document_root=None, show_indexes=False):
return directory_index(newpath, fullpath) return directory_index(newpath, fullpath)
raise Http404(_(u"Directory indexes are not allowed here.")) raise Http404(_(u"Directory indexes are not allowed here."))
if not os.path.exists(fullpath): 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. # Respect the If-Modified-Since header.
statobj = os.stat(fullpath) statobj = os.stat(fullpath)
mimetype, encoding = mimetypes.guess_type(fullpath) mimetype, encoding = mimetypes.guess_type(fullpath)