diff --git a/django/conf/global_settings.py b/django/conf/global_settings.py index 863bb2e5cd..597091916a 100644 --- a/django/conf/global_settings.py +++ b/django/conf/global_settings.py @@ -130,10 +130,8 @@ LANGUAGES = ( ('uk', gettext_noop('Ukrainian')), ('ur', gettext_noop('Urdu')), ('vi', gettext_noop('Vietnamese')), - ('zh-cn', gettext_noop('Simplified Chinese')), ('zh-hans', gettext_noop('Simplified Chinese')), ('zh-hant', gettext_noop('Traditional Chinese')), - ('zh-tw', gettext_noop('Traditional Chinese')), ) # Languages using BiDi (right-to-left) layout diff --git a/django/conf/locale/__init__.py b/django/conf/locale/__init__.py index f2affb2248..b5cab321d1 100644 --- a/django/conf/locale/__init__.py +++ b/django/conf/locale/__init__.py @@ -511,10 +511,6 @@ LANG_INFO = { }, 'zh-cn': { 'fallback': ['zh-hans'], - 'bidi': False, - 'code': 'zh-cn', - 'name': 'Simplified Chinese', - 'name_local': '简体中文', }, 'zh-hans': { 'bidi': False, @@ -542,9 +538,5 @@ LANG_INFO = { }, 'zh-tw': { 'fallback': ['zh-hant'], - 'bidi': False, - 'code': 'zh-tw', - 'name': 'Traditional Chinese', - 'name_local': '繁體中文', }, } diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo b/django/conf/locale/zh_CN/LC_MESSAGES/django.mo deleted file mode 100644 index e95e910647..0000000000 Binary files a/django/conf/locale/zh_CN/LC_MESSAGES/django.mo and /dev/null differ diff --git a/django/conf/locale/zh_CN/LC_MESSAGES/django.po b/django/conf/locale/zh_CN/LC_MESSAGES/django.po deleted file mode 100644 index 92056e7f69..0000000000 --- a/django/conf/locale/zh_CN/LC_MESSAGES/django.po +++ /dev/null @@ -1,1376 +0,0 @@ -# This file is distributed under the same license as the Django package. -# -# Translators: -# Daniel Duan , 2013 -# Jannis Leidel , 2011 -# Kevin Sze , 2012 -# Lele Long , 2011 -# ouyanghongyu , 2014 -# pylemon , 2013 -# slene , 2011 -# Sun Liwen , 2014 -# Xiang Yu , 2014 -# Yin Jifeng , 2013 -# Ziang Song , 2011-2012 -# Kevin Sze , 2012 -msgid "" -msgstr "" -"Project-Id-Version: django\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-23 14:10+0200\n" -"PO-Revision-Date: 2014-09-04 10:36+0000\n" -"Last-Translator: ouyanghongyu \n" -"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/django/" -"language/zh_CN/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: zh_CN\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: conf/global_settings.py:51 -msgid "Afrikaans" -msgstr "南非语" - -#: conf/global_settings.py:52 -msgid "Arabic" -msgstr "阿拉伯语" - -#: conf/global_settings.py:53 -msgid "Asturian" -msgstr "" - -#: conf/global_settings.py:53 -msgid "Azerbaijani" -msgstr "阿塞拜疆语" - -#: conf/global_settings.py:54 -msgid "Bulgarian" -msgstr "保加利亚语" - -#: conf/global_settings.py:55 -msgid "Belarusian" -msgstr "白俄罗斯语" - -#: conf/global_settings.py:56 -msgid "Bengali" -msgstr "孟加拉语" - -#: conf/global_settings.py:57 -msgid "Breton" -msgstr "布雷顿" - -#: conf/global_settings.py:58 -msgid "Bosnian" -msgstr "波斯尼亚语" - -#: conf/global_settings.py:59 -msgid "Catalan" -msgstr "加泰罗尼亚语" - -#: conf/global_settings.py:60 -msgid "Czech" -msgstr "捷克语" - -#: conf/global_settings.py:61 -msgid "Welsh" -msgstr "威尔士语" - -#: conf/global_settings.py:62 -msgid "Danish" -msgstr "丹麦语" - -#: conf/global_settings.py:63 -msgid "German" -msgstr "德语" - -#: conf/global_settings.py:64 -msgid "Greek" -msgstr "希腊语" - -#: conf/global_settings.py:65 -msgid "English" -msgstr "英语" - -#: conf/global_settings.py:66 -msgid "Australian English" -msgstr "" - -#: conf/global_settings.py:67 -msgid "British English" -msgstr "英国英语" - -#: conf/global_settings.py:68 -msgid "Esperanto" -msgstr "世界语" - -#: conf/global_settings.py:69 -msgid "Spanish" -msgstr "西班牙语" - -#: conf/global_settings.py:70 -msgid "Argentinian Spanish" -msgstr "阿根廷西班牙语" - -#: conf/global_settings.py:71 -msgid "Mexican Spanish" -msgstr "墨西哥西班牙语" - -#: conf/global_settings.py:72 -msgid "Nicaraguan Spanish" -msgstr "尼加拉瓜西班牙语" - -#: conf/global_settings.py:73 -msgid "Venezuelan Spanish" -msgstr "委内瑞拉西班牙语" - -#: conf/global_settings.py:74 -msgid "Estonian" -msgstr "爱沙尼亚语" - -#: conf/global_settings.py:75 -msgid "Basque" -msgstr "巴斯克语" - -#: conf/global_settings.py:76 -msgid "Persian" -msgstr "波斯语" - -#: conf/global_settings.py:77 -msgid "Finnish" -msgstr "芬兰语" - -#: conf/global_settings.py:78 -msgid "French" -msgstr "法语" - -#: conf/global_settings.py:79 -msgid "Frisian" -msgstr "夫里斯兰语" - -#: conf/global_settings.py:80 -msgid "Irish" -msgstr "爱尔兰语" - -#: conf/global_settings.py:81 -msgid "Galician" -msgstr "加利西亚语" - -#: conf/global_settings.py:82 -msgid "Hebrew" -msgstr "希伯来语" - -#: conf/global_settings.py:83 -msgid "Hindi" -msgstr "北印度语" - -#: conf/global_settings.py:84 -msgid "Croatian" -msgstr "克罗地亚语" - -#: conf/global_settings.py:85 -msgid "Hungarian" -msgstr "匈牙利语" - -#: conf/global_settings.py:86 -msgid "Interlingua" -msgstr "国际语" - -#: conf/global_settings.py:87 -msgid "Indonesian" -msgstr "印尼语" - -#: conf/global_settings.py:88 -msgid "Ido" -msgstr "" - -#: conf/global_settings.py:88 -msgid "Icelandic" -msgstr "冰岛语" - -#: conf/global_settings.py:89 -msgid "Italian" -msgstr "意大利语" - -#: conf/global_settings.py:90 -msgid "Japanese" -msgstr "日语" - -#: conf/global_settings.py:91 -msgid "Georgian" -msgstr "格鲁吉亚语" - -#: conf/global_settings.py:92 -msgid "Kazakh" -msgstr "哈萨克语" - -#: conf/global_settings.py:93 -msgid "Khmer" -msgstr "高棉语" - -#: conf/global_settings.py:94 -msgid "Kannada" -msgstr "埃纳德语" - -#: conf/global_settings.py:95 -msgid "Korean" -msgstr "韩语" - -#: conf/global_settings.py:96 -msgid "Luxembourgish" -msgstr "卢森堡语" - -#: conf/global_settings.py:97 -msgid "Lithuanian" -msgstr "立陶宛语" - -#: conf/global_settings.py:98 -msgid "Latvian" -msgstr "拉脱维亚语" - -#: conf/global_settings.py:99 -msgid "Macedonian" -msgstr "马其顿语" - -#: conf/global_settings.py:100 -msgid "Malayalam" -msgstr "马来亚拉姆语" - -#: conf/global_settings.py:101 -msgid "Mongolian" -msgstr "蒙古语" - -#: conf/global_settings.py:102 -msgid "Marathi" -msgstr "" - -#: conf/global_settings.py:102 -msgid "Burmese" -msgstr "缅甸语" - -#: conf/global_settings.py:103 -msgid "Norwegian Bokmal" -msgstr "挪威博克马尔" - -#: conf/global_settings.py:104 -msgid "Nepali" -msgstr "尼泊尔语" - -#: conf/global_settings.py:105 -msgid "Dutch" -msgstr "荷兰语" - -#: conf/global_settings.py:106 -msgid "Norwegian Nynorsk" -msgstr "新挪威语" - -#: conf/global_settings.py:107 -msgid "Ossetic" -msgstr "奥塞梯语" - -#: conf/global_settings.py:108 -msgid "Punjabi" -msgstr "旁遮普语 " - -#: conf/global_settings.py:109 -msgid "Polish" -msgstr "波兰语" - -#: conf/global_settings.py:110 -msgid "Portuguese" -msgstr "葡萄牙语" - -#: conf/global_settings.py:111 -msgid "Brazilian Portuguese" -msgstr "巴西葡萄牙语" - -#: conf/global_settings.py:112 -msgid "Romanian" -msgstr "罗马尼亚语" - -#: conf/global_settings.py:113 -msgid "Russian" -msgstr "俄语" - -#: conf/global_settings.py:114 -msgid "Slovak" -msgstr "斯洛伐克语" - -#: conf/global_settings.py:115 -msgid "Slovenian" -msgstr "斯洛文尼亚语" - -#: conf/global_settings.py:116 -msgid "Albanian" -msgstr "阿尔巴尼亚语" - -#: conf/global_settings.py:117 -msgid "Serbian" -msgstr "塞尔维亚语" - -#: conf/global_settings.py:118 -msgid "Serbian Latin" -msgstr "塞尔维亚拉丁语" - -#: conf/global_settings.py:119 -msgid "Swedish" -msgstr "瑞典语" - -#: conf/global_settings.py:120 -msgid "Swahili" -msgstr "斯瓦西里语" - -#: conf/global_settings.py:121 -msgid "Tamil" -msgstr "泰米尔语" - -#: conf/global_settings.py:122 -msgid "Telugu" -msgstr "泰卢固语" - -#: conf/global_settings.py:123 -msgid "Thai" -msgstr "泰语" - -#: conf/global_settings.py:124 -msgid "Turkish" -msgstr "土耳其语" - -#: conf/global_settings.py:125 -msgid "Tatar" -msgstr "鞑靼语" - -#: conf/global_settings.py:126 -msgid "Udmurt" -msgstr "乌德穆尔特语" - -#: conf/global_settings.py:127 -msgid "Ukrainian" -msgstr "乌克兰语" - -#: conf/global_settings.py:128 -msgid "Urdu" -msgstr "乌尔都语" - -#: conf/global_settings.py:129 -msgid "Vietnamese" -msgstr "越南语" - -#: conf/global_settings.py:130 conf/global_settings.py:131 -msgid "Simplified Chinese" -msgstr "简体中文" - -#: conf/global_settings.py:132 conf/global_settings.py:133 -msgid "Traditional Chinese" -msgstr "繁体中文" - -#: contrib/sitemaps/apps.py:8 -msgid "Site Maps" -msgstr "" - -#: contrib/staticfiles/apps.py:8 -msgid "Static Files" -msgstr "" - -#: contrib/syndication/apps.py:8 -msgid "Syndication" -msgstr "" - -#: contrib/webdesign/apps.py:8 -msgid "Web Design" -msgstr "" - -#: core/validators.py:21 -msgid "Enter a valid value." -msgstr "输入一个有效的值。" - -#: core/validators.py:77 forms/fields.py:675 -msgid "Enter a valid URL." -msgstr "输入一个有效的 URL。" - -#: core/validators.py:115 -msgid "Enter a valid integer." -msgstr "" - -#: core/validators.py:120 -msgid "Enter a valid email address." -msgstr "输入一个合法的Email地址." - -#: core/validators.py:185 -msgid "" -"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." -msgstr "输入一个有效的 'slug'，由字母、数字、下划线或横线组成。" - -#: core/validators.py:188 core/validators.py:207 -msgid "Enter a valid IPv4 address." -msgstr "输入一个有效的 IPv4 地址。" - -#: core/validators.py:193 core/validators.py:208 -msgid "Enter a valid IPv6 address." -msgstr "填写合法的IPv6地址。" - -#: core/validators.py:203 core/validators.py:206 -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "输入可用的IPv4 或 IPv6 地址." - -#: core/validators.py:229 db/models/fields/__init__.py:1070 -msgid "Enter only digits separated by commas." -msgstr "只能输入用逗号分隔的数字。" - -#: core/validators.py:236 -#, python-format -msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." -msgstr "确保该值为 %(limit_value)s (现在为 %(show_value)s)。" - -#: core/validators.py:255 -#, python-format -msgid "Ensure this value is less than or equal to %(limit_value)s." -msgstr "确保该值小于或等于%(limit_value)s。" - -#: core/validators.py:262 -#, python-format -msgid "Ensure this value is greater than or equal to %(limit_value)s." -msgstr "确保该值大于或等于%(limit_value)s。" - -#: core/validators.py:271 -#, python-format -msgid "" -"Ensure this value has at least %(limit_value)d character (it has " -"%(show_value)d)." -msgid_plural "" -"Ensure this value has at least %(limit_value)d characters (it has " -"%(show_value)d)." -msgstr[0] "" -"确保该变量至少包含 %(limit_value)d 字符(目前字符数 %(show_value)d)。" - -#: core/validators.py:282 -#, python-format -msgid "" -"Ensure this value has at most %(limit_value)d character (it has " -"%(show_value)d)." -msgid_plural "" -"Ensure this value has at most %(limit_value)d characters (it has " -"%(show_value)d)." -msgstr[0] "" -"确保该变量包含不超过 %(limit_value)d 字符 (目前字符数 %(show_value)d)。" - -#: db/models/base.py:975 forms/models.py:718 -msgid "and" -msgstr "和" - -#: db/models/base.py:977 -#, python-format -msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" - -#: db/models/fields/__init__.py:104 -#, python-format -msgid "Value %(value)r is not a valid choice." -msgstr "" - -#: db/models/fields/__init__.py:105 -msgid "This field cannot be null." -msgstr "这个值不能为 null。" - -#: db/models/fields/__init__.py:106 -msgid "This field cannot be blank." -msgstr "此字段不能为空。" - -#: db/models/fields/__init__.py:107 -#, python-format -msgid "%(model_name)s with this %(field_label)s already exists." -msgstr "具有 %(field_label)s 的 %(model_name)s 已存在。" - -#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. -#. Eg: "Title must be unique for pub_date year" -#: db/models/fields/__init__.py:111 -#, python-format -msgid "" -"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." -msgstr "" - -#: db/models/fields/__init__.py:116 -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "字段类型：%(field_type)s" - -#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573 -msgid "Integer" -msgstr "整数" - -#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571 -#, python-format -msgid "'%(value)s' value must be an integer." -msgstr "" - -#: db/models/fields/__init__.py:926 -#, python-format -msgid "'%(value)s' value must be either True or False." -msgstr "" - -#: db/models/fields/__init__.py:928 -msgid "Boolean (Either True or False)" -msgstr "布尔值（真或假）" - -#: db/models/fields/__init__.py:1004 -#, python-format -msgid "String (up to %(max_length)s)" -msgstr "字符串（最长 %(max_length)s 位）" - -#: db/models/fields/__init__.py:1065 -msgid "Comma-separated integers" -msgstr "逗号分隔的整数" - -#: db/models/fields/__init__.py:1080 -#, python-format -msgid "" -"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " -"format." -msgstr "" - -#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189 -#, python-format -msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " -"date." -msgstr "" - -#: db/models/fields/__init__.py:1085 -msgid "Date (without time)" -msgstr "日期（无时间）" - -#: db/models/fields/__init__.py:1187 -#, python-format -msgid "" -"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." -"uuuuuu]][TZ] format." -msgstr "" - -#: db/models/fields/__init__.py:1191 -#, python-format -msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) but it is an invalid date/time." -msgstr "" - -#: db/models/fields/__init__.py:1195 -msgid "Date (with time)" -msgstr "日期（带时间）" - -#: db/models/fields/__init__.py:1297 -#, python-format -msgid "'%(value)s' value must be a decimal number." -msgstr "" - -#: db/models/fields/__init__.py:1299 -msgid "Decimal number" -msgstr "小数" - -#: db/models/fields/__init__.py:1444 -msgid "Email address" -msgstr "Email 地址" - -#: db/models/fields/__init__.py:1470 -msgid "File path" -msgstr "文件路径" - -#: db/models/fields/__init__.py:1537 -#, python-format -msgid "'%(value)s' value must be a float." -msgstr "" - -#: db/models/fields/__init__.py:1539 -msgid "Floating point number" -msgstr "浮点数" - -#: db/models/fields/__init__.py:1623 -msgid "Big (8 byte) integer" -msgstr "大整数(8字节)" - -#: db/models/fields/__init__.py:1638 -msgid "IPv4 address" -msgstr "IPv4 地址" - -#: db/models/fields/__init__.py:1668 -msgid "IP address" -msgstr "IP 地址" - -#: db/models/fields/__init__.py:1747 -#, python-format -msgid "'%(value)s' value must be either None, True or False." -msgstr "" - -#: db/models/fields/__init__.py:1749 -msgid "Boolean (Either True, False or None)" -msgstr "布尔值（真、假或无)" - -#: db/models/fields/__init__.py:1809 -msgid "Positive integer" -msgstr "正整数" - -#: db/models/fields/__init__.py:1821 -msgid "Positive small integer" -msgstr "正小整数" - -#: db/models/fields/__init__.py:1834 -#, python-format -msgid "Slug (up to %(max_length)s)" -msgstr "Slug (多达 %(max_length)s)" - -#: db/models/fields/__init__.py:1863 -msgid "Small integer" -msgstr "小整数" - -#: db/models/fields/__init__.py:1870 -msgid "Text" -msgstr "文本" - -#: db/models/fields/__init__.py:1893 -#, python-format -msgid "" -"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " -"format." -msgstr "" - -#: db/models/fields/__init__.py:1895 -#, python-format -msgid "" -"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " -"invalid time." -msgstr "" - -#: db/models/fields/__init__.py:1898 -msgid "Time" -msgstr "时间" - -#: db/models/fields/__init__.py:1977 -msgid "URL" -msgstr "URL" - -#: db/models/fields/__init__.py:2000 -msgid "Raw binary data" -msgstr "原始二进制数据" - -#: db/models/fields/files.py:225 -msgid "File" -msgstr "文件" - -#: db/models/fields/files.py:375 -msgid "Image" -msgstr "图像" - -#: db/models/fields/related.py:1580 -#, python-format -msgid "%(model)s instance with pk %(pk)r does not exist." -msgstr "" - -#: db/models/fields/related.py:1582 -msgid "Foreign Key (type determined by related field)" -msgstr "外键(由相关字段确定)" - -#: db/models/fields/related.py:1773 -msgid "One-to-one relationship" -msgstr "一对一关系" - -#: db/models/fields/related.py:1843 -msgid "Many-to-many relationship" -msgstr "多对多关系" - -#: forms/fields.py:55 -msgid "This field is required." -msgstr "这个字段是必填项。" - -#: forms/fields.py:236 -msgid "Enter a whole number." -msgstr "输入整数。" - -#: forms/fields.py:279 forms/fields.py:316 -msgid "Enter a number." -msgstr "输入一个数字。" - -#: forms/fields.py:318 -#, python-format -msgid "Ensure that there are no more than %(max)s digit in total." -msgid_plural "Ensure that there are no more than %(max)s digits in total." -msgstr[0] "确认总共不超过 %(max)s 个数字." - -#: forms/fields.py:322 -#, python-format -msgid "Ensure that there are no more than %(max)s decimal place." -msgid_plural "Ensure that there are no more than %(max)s decimal places." -msgstr[0] "确认小数不超过 %(max)s 位." - -#: forms/fields.py:326 -#, python-format -msgid "" -"Ensure that there are no more than %(max)s digit before the decimal point." -msgid_plural "" -"Ensure that there are no more than %(max)s digits before the decimal point." -msgstr[0] "确认小数点前不超过 %(max)s 位。" - -#: forms/fields.py:437 forms/fields.py:1139 -msgid "Enter a valid date." -msgstr "输入一个有效的日期。" - -#: forms/fields.py:461 forms/fields.py:1140 -msgid "Enter a valid time." -msgstr "输入一个有效的时间。" - -#: forms/fields.py:483 -msgid "Enter a valid date/time." -msgstr "输入一个有效的日期/时间。" - -#: forms/fields.py:564 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "未提交文件。请检查表单的编码类型。" - -#: forms/fields.py:565 -msgid "No file was submitted." -msgstr "没有提交文件。" - -#: forms/fields.py:566 -msgid "The submitted file is empty." -msgstr "所提交的是空文件。" - -#: forms/fields.py:568 -#, python-format -msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." -msgid_plural "" -"Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr[0] "确保该文件名长度不超过 %(max)d 字符(目前字符数 %(length)d)。" - -#: forms/fields.py:571 -msgid "Please either submit a file or check the clear checkbox, not both." -msgstr "请提交文件或勾选清除复选框，两者其一即可。" - -#: forms/fields.py:632 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "请上传一张有效的图片。您所上传的文件不是图片或者是已损坏的图片。" - -#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192 -#, python-format -msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "选择一个有效的选项。 %(value)s 不在可用的选项中。" - -#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191 -msgid "Enter a list of values." -msgstr "输入一系列值。" - -#: forms/fields.py:988 -msgid "Enter a complete value." -msgstr "" - -#. Translators: This is the default suffix added to form field labels -#: forms/forms.py:122 -msgid ":" -msgstr ":" - -#: forms/forms.py:192 -#, python-format -msgid "(Hidden field %(name)s) %(error)s" -msgstr "(隐藏字段 %(name)s) %(error)s" - -#. Translators: If found as last label character, these punctuation -#. characters will prevent the default label_suffix to be appended to the -#. label -#: forms/forms.py:620 -msgid ":?.!" -msgstr ":?.!" - -#: forms/formsets.py:95 -msgid "ManagementForm data is missing or has been tampered with" -msgstr "" - -#: forms/formsets.py:332 -#, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "请提交不超过 %d 个表格。" - -#: forms/formsets.py:339 -#, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "" - -#: forms/formsets.py:367 forms/formsets.py:369 -msgid "Order" -msgstr "排序" - -#: forms/formsets.py:371 -msgid "Delete" -msgstr "删除" - -#: forms/models.py:712 -#, python-format -msgid "Please correct the duplicate data for %(field)s." -msgstr "请修改%(field)s的重复数据" - -#: forms/models.py:716 -#, python-format -msgid "Please correct the duplicate data for %(field)s, which must be unique." -msgstr "请修改%(field)s的重复数据.这个字段必须唯一" - -#: forms/models.py:722 -#, python-format -msgid "" -"Please correct the duplicate data for %(field_name)s which must be unique " -"for the %(lookup)s in %(date_field)s." -msgstr "" -"请修正%(field_name)s的重复数据。%(date_field)s %(lookup)s 在 %(field_name)s " -"必须保证唯一." - -#: forms/models.py:730 -msgid "Please correct the duplicate values below." -msgstr "请修正重复的数据." - -#: forms/models.py:1028 -msgid "The inline foreign key did not match the parent instance primary key." -msgstr "内联外键与父实例的主键不匹配。" - -#: forms/models.py:1094 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "选择一个有效的选项： 该选择不在可用的选项中。" - -#: forms/models.py:1194 -#, python-format -msgid "\"%(pk)s\" is not a valid value for a primary key." -msgstr "\"%(pk)s\" 不是一个合法的主键值." - -#: forms/models.py:1205 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "按下 \"Control\"，或者在Mac上按 \"Command\" 来选择多个值。" - -#: forms/utils.py:148 -#, python-format -msgid "" -"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " -"may be ambiguous or it may not exist." -msgstr "" -"%(datetime)s 不能在时区 %(current_timezone)s正确解读; 可能时间有歧义或者不存" -"在." - -#: forms/widgets.py:350 -msgid "Currently" -msgstr "目前" - -#: forms/widgets.py:351 -msgid "Change" -msgstr "修改" - -#: forms/widgets.py:352 -msgid "Clear" -msgstr "清除" - -#: forms/widgets.py:546 -msgid "Unknown" -msgstr "未知" - -#: forms/widgets.py:547 -msgid "Yes" -msgstr "是" - -#: forms/widgets.py:548 -msgid "No" -msgstr "否" - -#: template/defaultfilters.py:855 -msgid "yes,no,maybe" -msgstr "是、否、也许" - -#: template/defaultfilters.py:884 template/defaultfilters.py:896 -#, python-format -msgid "%(size)d byte" -msgid_plural "%(size)d bytes" -msgstr[0] "%(size)d 字节" - -#: template/defaultfilters.py:898 -#, python-format -msgid "%s KB" -msgstr "%s KB" - -#: template/defaultfilters.py:900 -#, python-format -msgid "%s MB" -msgstr "%s MB" - -#: template/defaultfilters.py:902 -#, python-format -msgid "%s GB" -msgstr "%s GB" - -#: template/defaultfilters.py:904 -#, python-format -msgid "%s TB" -msgstr "%s TB" - -#: template/defaultfilters.py:906 -#, python-format -msgid "%s PB" -msgstr "%s PB" - -#: utils/dateformat.py:59 -msgid "p.m." -msgstr "p.m." - -#: utils/dateformat.py:60 -msgid "a.m." -msgstr "a.m." - -#: utils/dateformat.py:65 -msgid "PM" -msgstr "PM" - -#: utils/dateformat.py:66 -msgid "AM" -msgstr "AM" - -#: utils/dateformat.py:149 -msgid "midnight" -msgstr "午夜" - -#: utils/dateformat.py:151 -msgid "noon" -msgstr "中午" - -#: utils/dates.py:6 -msgid "Monday" -msgstr "星期一" - -#: utils/dates.py:6 -msgid "Tuesday" -msgstr "星期二" - -#: utils/dates.py:6 -msgid "Wednesday" -msgstr "星期三" - -#: utils/dates.py:6 -msgid "Thursday" -msgstr "星期四" - -#: utils/dates.py:6 -msgid "Friday" -msgstr "星期五" - -#: utils/dates.py:7 -msgid "Saturday" -msgstr "星期六" - -#: utils/dates.py:7 -msgid "Sunday" -msgstr "星期日" - -#: utils/dates.py:10 -msgid "Mon" -msgstr "星期一" - -#: utils/dates.py:10 -msgid "Tue" -msgstr "星期二" - -#: utils/dates.py:10 -msgid "Wed" -msgstr "星期三" - -#: utils/dates.py:10 -msgid "Thu" -msgstr "星期四" - -#: utils/dates.py:10 -msgid "Fri" -msgstr "星期五" - -#: utils/dates.py:11 -msgid "Sat" -msgstr "星期六" - -#: utils/dates.py:11 -msgid "Sun" -msgstr "星期日" - -#: utils/dates.py:18 -msgid "January" -msgstr "一月" - -#: utils/dates.py:18 -msgid "February" -msgstr "二月" - -#: utils/dates.py:18 -msgid "March" -msgstr "三月" - -#: utils/dates.py:18 -msgid "April" -msgstr "四月" - -#: utils/dates.py:18 -msgid "May" -msgstr "五月" - -#: utils/dates.py:18 -msgid "June" -msgstr "六月" - -#: utils/dates.py:19 -msgid "July" -msgstr "七月" - -#: utils/dates.py:19 -msgid "August" -msgstr "八月" - -#: utils/dates.py:19 -msgid "September" -msgstr "九月" - -#: utils/dates.py:19 -msgid "October" -msgstr "十月" - -#: utils/dates.py:19 -msgid "November" -msgstr "十一月" - -#: utils/dates.py:20 -msgid "December" -msgstr "十二月" - -#: utils/dates.py:23 -msgid "jan" -msgstr "一月" - -#: utils/dates.py:23 -msgid "feb" -msgstr "二月" - -#: utils/dates.py:23 -msgid "mar" -msgstr "三月" - -#: utils/dates.py:23 -msgid "apr" -msgstr "四月" - -#: utils/dates.py:23 -msgid "may" -msgstr "五月" - -#: utils/dates.py:23 -msgid "jun" -msgstr "六月" - -#: utils/dates.py:24 -msgid "jul" -msgstr "七月" - -#: utils/dates.py:24 -msgid "aug" -msgstr "八月" - -#: utils/dates.py:24 -msgid "sep" -msgstr "九月" - -#: utils/dates.py:24 -msgid "oct" -msgstr "十月" - -#: utils/dates.py:24 -msgid "nov" -msgstr "十一月" - -#: utils/dates.py:24 -msgid "dec" -msgstr "十二月" - -#: utils/dates.py:31 -msgctxt "abbrev. month" -msgid "Jan." -msgstr "一月" - -#: utils/dates.py:32 -msgctxt "abbrev. month" -msgid "Feb." -msgstr "二月" - -#: utils/dates.py:33 -msgctxt "abbrev. month" -msgid "March" -msgstr "三月" - -#: utils/dates.py:34 -msgctxt "abbrev. month" -msgid "April" -msgstr "四月" - -#: utils/dates.py:35 -msgctxt "abbrev. month" -msgid "May" -msgstr "五月" - -#: utils/dates.py:36 -msgctxt "abbrev. month" -msgid "June" -msgstr "六月" - -#: utils/dates.py:37 -msgctxt "abbrev. month" -msgid "July" -msgstr "七月" - -#: utils/dates.py:38 -msgctxt "abbrev. month" -msgid "Aug." -msgstr "八月" - -#: utils/dates.py:39 -msgctxt "abbrev. month" -msgid "Sept." -msgstr "九月" - -#: utils/dates.py:40 -msgctxt "abbrev. month" -msgid "Oct." -msgstr "十月" - -#: utils/dates.py:41 -msgctxt "abbrev. month" -msgid "Nov." -msgstr "十一月" - -#: utils/dates.py:42 -msgctxt "abbrev. month" -msgid "Dec." -msgstr "十二月" - -#: utils/dates.py:45 -msgctxt "alt. month" -msgid "January" -msgstr "一月" - -#: utils/dates.py:46 -msgctxt "alt. month" -msgid "February" -msgstr "二月" - -#: utils/dates.py:47 -msgctxt "alt. month" -msgid "March" -msgstr "三月" - -#: utils/dates.py:48 -msgctxt "alt. month" -msgid "April" -msgstr "四月" - -#: utils/dates.py:49 -msgctxt "alt. month" -msgid "May" -msgstr "五月" - -#: utils/dates.py:50 -msgctxt "alt. month" -msgid "June" -msgstr "六月" - -#: utils/dates.py:51 -msgctxt "alt. month" -msgid "July" -msgstr "七月" - -#: utils/dates.py:52 -msgctxt "alt. month" -msgid "August" -msgstr "八月" - -#: utils/dates.py:53 -msgctxt "alt. month" -msgid "September" -msgstr "九月" - -#: utils/dates.py:54 -msgctxt "alt. month" -msgid "October" -msgstr "十月" - -#: utils/dates.py:55 -msgctxt "alt. month" -msgid "November" -msgstr "十一月" - -#: utils/dates.py:56 -msgctxt "alt. month" -msgid "December" -msgstr "十二月" - -#: utils/ipv6.py:10 -msgid "This is not a valid IPv6 address." -msgstr "" - -#: utils/text.py:76 -#, python-format -msgctxt "String to return when truncating text" -msgid "%(truncated_text)s..." -msgstr "%(truncated_text)s..." - -#: utils/text.py:245 -msgid "or" -msgstr "或" - -#. Translators: This string is used as a separator between list elements -#: utils/text.py:264 utils/timesince.py:57 -msgid ", " -msgstr "，" - -#: utils/timesince.py:25 -#, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "%d 年" - -#: utils/timesince.py:26 -#, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "%d 月" - -#: utils/timesince.py:27 -#, python-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "%d 周" - -#: utils/timesince.py:28 -#, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 日" - -#: utils/timesince.py:29 -#, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 小时" - -#: utils/timesince.py:30 -#, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分钟" - -#: utils/timesince.py:46 -msgid "0 minutes" -msgstr "0 分钟" - -#: views/csrf.py:105 -msgid "Forbidden" -msgstr "" - -#: views/csrf.py:106 -msgid "CSRF verification failed. Request aborted." -msgstr "CSRF验证失败. 相应中断." - -#: views/csrf.py:110 -msgid "" -"You are seeing this message because this HTTPS site requires a 'Referer " -"header' to be sent by your Web browser, but none was sent. This header is " -"required for security reasons, to ensure that your browser is not being " -"hijacked by third parties." -msgstr "" - -#: views/csrf.py:115 -msgid "" -"If you have configured your browser to disable 'Referer' headers, please re-" -"enable them, at least for this site, or for HTTPS connections, or for 'same-" -"origin' requests." -msgstr "" - -#: views/csrf.py:120 -msgid "" -"You are seeing this message because this site requires a CSRF cookie when " -"submitting forms. This cookie is required for security reasons, to ensure " -"that your browser is not being hijacked by third parties." -msgstr "" - -#: views/csrf.py:125 -msgid "" -"If you have configured your browser to disable cookies, please re-enable " -"them, at least for this site, or for 'same-origin' requests." -msgstr "" - -#: views/csrf.py:129 -msgid "More information is available with DEBUG=True." -msgstr "" - -#: views/generic/dates.py:43 -msgid "No year specified" -msgstr "没有指定年" - -#: views/generic/dates.py:99 -msgid "No month specified" -msgstr "没有指定月" - -#: views/generic/dates.py:158 -msgid "No day specified" -msgstr "没有指定天" - -#: views/generic/dates.py:214 -msgid "No week specified" -msgstr "没有指定周" - -#: views/generic/dates.py:369 views/generic/dates.py:397 -#, python-format -msgid "No %(verbose_name_plural)s available" -msgstr "%(verbose_name_plural)s 不存在" - -#: views/generic/dates.py:650 -#, python-format -msgid "" -"Future %(verbose_name_plural)s not available because %(class_name)s." -"allow_future is False." -msgstr "" -"因为 %(class_name)s.allow_future 设置为 False，所以特性 " -"%(verbose_name_plural)s 不可用。" - -#: views/generic/dates.py:682 -#, python-format -msgid "Invalid date string '%(datestr)s' given format '%(format)s'" -msgstr "日期字符串 '%(datestr)s' 与格式 '%(format)s' 不匹配" - -#: views/generic/detail.py:54 -#, python-format -msgid "No %(verbose_name)s found matching the query" -msgstr "没有找到符合查询的 %(verbose_name)s" - -#: views/generic/list.py:62 -msgid "Page is not 'last', nor can it be converted to an int." -msgstr "page 不等于 'last'，或者它不能被转为数字。" - -#: views/generic/list.py:67 -#, python-format -msgid "Invalid page (%(page_number)s): %(message)s" -msgstr "非法页面 (%(page_number)s): %(message)s" - -#: views/generic/list.py:158 -#, python-format -msgid "Empty list and '%(class_name)s.allow_empty' is False." -msgstr "列表是空的并且'%(class_name)s.allow_empty 设置为 False'" - -#: views/static.py:54 -msgid "Directory indexes are not allowed here." -msgstr "这里不允许目录索引" - -#: views/static.py:56 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" 不存在" - -#: views/static.py:97 -#, python-format -msgid "Index of %(directory)s" -msgstr "%(directory)s的索引" diff --git a/django/conf/locale/zh_CN/__init__.py b/django/conf/locale/zh_CN/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/conf/locale/zh_CN/formats.py b/django/conf/locale/zh_CN/formats.py deleted file mode 100644 index f855dec5b2..0000000000 --- a/django/conf/locale/zh_CN/formats.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- encoding: utf-8 -*- -# This file is distributed under the same license as the Django package. -# -from __future__ import unicode_literals - -# The *_FORMAT strings use the Django date format syntax, -# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 -TIME_FORMAT = 'H:i' # 20:45 -DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 -YEAR_MONTH_FORMAT = 'Y年n月' # 2016年9月 -MONTH_DAY_FORMAT = 'm月j日' # 9月5日 -SHORT_DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 -SHORT_DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 -FIRST_DAY_OF_WEEK = 1 # 星期一 (Monday) - -# The *_INPUT_FORMATS strings use the Python strftime format syntax, -# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -DATE_INPUT_FORMATS = ( - '%Y/%m/%d', # '2016/09/05' - '%Y-%m-%d', # '2016-09-05' - '%Y年%n月%j日', # '2016年9月5日' -) - -TIME_INPUT_FORMATS = ( - '%H:%M', # '20:45' - '%H:%M:%S', # '20:45:29' - '%H:%M:%S.%f', # '20:45:29.000200' -) - -DATETIME_INPUT_FORMATS = ( - '%Y/%m/%d %H:%M', # '2016/09/05 20:45' - '%Y-%m-%d %H:%M', # '2016-09-05 20:45' - '%Y年%n月%j日 %H:%M', # '2016年9月5日 14:45' - '%Y/%m/%d %H:%M:%S', # '2016/09/05 20:45:29' - '%Y-%m-%d %H:%M:%S', # '2016-09-05 20:45:29' - '%Y年%n月%j日 %H:%M:%S', # '2016年9月5日 20:45:29' - '%Y/%m/%d %H:%M:%S.%f', # '2016/09/05 20:45:29.000200' - '%Y-%m-%d %H:%M:%S.%f', # '2016-09-05 20:45:29.000200' - '%Y年%n月%j日 %H:%n:%S.%f', # '2016年9月5日 20:45:29.000200' -) - -DECIMAL_SEPARATOR = '.' -THOUSAND_SEPARATOR = '' -NUMBER_GROUPING = 4 diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo b/django/conf/locale/zh_TW/LC_MESSAGES/django.mo deleted file mode 100644 index 5b01df21ff..0000000000 Binary files a/django/conf/locale/zh_TW/LC_MESSAGES/django.mo and /dev/null differ diff --git a/django/conf/locale/zh_TW/LC_MESSAGES/django.po b/django/conf/locale/zh_TW/LC_MESSAGES/django.po deleted file mode 100644 index 1d45681df1..0000000000 --- a/django/conf/locale/zh_TW/LC_MESSAGES/django.po +++ /dev/null @@ -1,1369 +0,0 @@ -# This file is distributed under the same license as the Django package. -# -# Translators: -# Eric Ho , 2013 -# ilay , 2012 -# Jannis Leidel , 2011 -# mail6543210 , 2013 -# ming hsien tzang , 2011 -# tcc , 2011 -# Yeh-Yung , 2013 -# Yeh-Yung , 2012 -msgid "" -msgstr "" -"Project-Id-Version: django\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-23 14:10+0200\n" -"PO-Revision-Date: 2014-08-24 08:52+0000\n" -"Last-Translator: Jannis Leidel \n" -"Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/django/" -"language/zh_TW/)\n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" -"Language: zh_TW\n" -"Plural-Forms: nplurals=1; plural=0;\n" - -#: conf/global_settings.py:51 -msgid "Afrikaans" -msgstr "南非語" - -#: conf/global_settings.py:52 -msgid "Arabic" -msgstr "阿拉伯語" - -#: conf/global_settings.py:53 -msgid "Asturian" -msgstr "" - -#: conf/global_settings.py:53 -msgid "Azerbaijani" -msgstr "阿塞拜疆(Azerbaijani)" - -#: conf/global_settings.py:54 -msgid "Bulgarian" -msgstr "保加利亞語" - -#: conf/global_settings.py:55 -msgid "Belarusian" -msgstr "白俄羅斯人" - -#: conf/global_settings.py:56 -msgid "Bengali" -msgstr "孟加拉語" - -#: conf/global_settings.py:57 -msgid "Breton" -msgstr "" - -#: conf/global_settings.py:58 -msgid "Bosnian" -msgstr "波士尼亞語" - -#: conf/global_settings.py:59 -msgid "Catalan" -msgstr "嘉泰羅尼亞語" - -#: conf/global_settings.py:60 -msgid "Czech" -msgstr "捷克語" - -#: conf/global_settings.py:61 -msgid "Welsh" -msgstr "威爾斯語" - -#: conf/global_settings.py:62 -msgid "Danish" -msgstr "丹麥語" - -#: conf/global_settings.py:63 -msgid "German" -msgstr "德語" - -#: conf/global_settings.py:64 -msgid "Greek" -msgstr "希臘語" - -#: conf/global_settings.py:65 -msgid "English" -msgstr "英語" - -#: conf/global_settings.py:66 -msgid "Australian English" -msgstr "" - -#: conf/global_settings.py:67 -msgid "British English" -msgstr "英國英語" - -#: conf/global_settings.py:68 -msgid "Esperanto" -msgstr "世界語(Esperanto)" - -#: conf/global_settings.py:69 -msgid "Spanish" -msgstr "西班牙語" - -#: conf/global_settings.py:70 -msgid "Argentinian Spanish" -msgstr "阿根廷西班牙語" - -#: conf/global_settings.py:71 -msgid "Mexican Spanish" -msgstr "墨西哥西班牙語(Mexican Spanish)" - -#: conf/global_settings.py:72 -msgid "Nicaraguan Spanish" -msgstr "尼加拉瓜西班牙語(Nicaraguan Spanish)" - -#: conf/global_settings.py:73 -msgid "Venezuelan Spanish" -msgstr "委內瑞拉西班牙人" - -#: conf/global_settings.py:74 -msgid "Estonian" -msgstr "愛沙尼亞語" - -#: conf/global_settings.py:75 -msgid "Basque" -msgstr "巴斯克語" - -#: conf/global_settings.py:76 -msgid "Persian" -msgstr "波斯語" - -#: conf/global_settings.py:77 -msgid "Finnish" -msgstr "芬蘭語" - -#: conf/global_settings.py:78 -msgid "French" -msgstr "法語" - -#: conf/global_settings.py:79 -msgid "Frisian" -msgstr "弗里斯蘭語" - -#: conf/global_settings.py:80 -msgid "Irish" -msgstr "愛爾蘭語" - -#: conf/global_settings.py:81 -msgid "Galician" -msgstr "加里西亞語" - -#: conf/global_settings.py:82 -msgid "Hebrew" -msgstr "希伯來語" - -#: conf/global_settings.py:83 -msgid "Hindi" -msgstr "印度語" - -#: conf/global_settings.py:84 -msgid "Croatian" -msgstr "克羅埃西亞語" - -#: conf/global_settings.py:85 -msgid "Hungarian" -msgstr "匈牙利語" - -#: conf/global_settings.py:86 -msgid "Interlingua" -msgstr "" - -#: conf/global_settings.py:87 -msgid "Indonesian" -msgstr "印尼語" - -#: conf/global_settings.py:88 -msgid "Ido" -msgstr "" - -#: conf/global_settings.py:88 -msgid "Icelandic" -msgstr "冰島語" - -#: conf/global_settings.py:89 -msgid "Italian" -msgstr "義大利語" - -#: conf/global_settings.py:90 -msgid "Japanese" -msgstr "日語" - -#: conf/global_settings.py:91 -msgid "Georgian" -msgstr "喬治亞語" - -#: conf/global_settings.py:92 -msgid "Kazakh" -msgstr "哈薩克(Kazakh)" - -#: conf/global_settings.py:93 -msgid "Khmer" -msgstr "高棉語" - -#: conf/global_settings.py:94 -msgid "Kannada" -msgstr "坎那達語" - -#: conf/global_settings.py:95 -msgid "Korean" -msgstr "韓語" - -#: conf/global_settings.py:96 -msgid "Luxembourgish" -msgstr "" - -#: conf/global_settings.py:97 -msgid "Lithuanian" -msgstr "立陶宛語" - -#: conf/global_settings.py:98 -msgid "Latvian" -msgstr "拉脫維亞語" - -#: conf/global_settings.py:99 -msgid "Macedonian" -msgstr "馬其頓語" - -#: conf/global_settings.py:100 -msgid "Malayalam" -msgstr "馬來亞拉姆語" - -#: conf/global_settings.py:101 -msgid "Mongolian" -msgstr "蒙古語" - -#: conf/global_settings.py:102 -msgid "Marathi" -msgstr "" - -#: conf/global_settings.py:102 -msgid "Burmese" -msgstr "" - -#: conf/global_settings.py:103 -msgid "Norwegian Bokmal" -msgstr "挪威語（波克默爾）" - -#: conf/global_settings.py:104 -msgid "Nepali" -msgstr "尼泊爾(Nepali)" - -#: conf/global_settings.py:105 -msgid "Dutch" -msgstr "荷蘭語" - -#: conf/global_settings.py:106 -msgid "Norwegian Nynorsk" -msgstr "挪威語（尼諾斯克）" - -#: conf/global_settings.py:107 -msgid "Ossetic" -msgstr "" - -#: conf/global_settings.py:108 -msgid "Punjabi" -msgstr "旁遮普語" - -#: conf/global_settings.py:109 -msgid "Polish" -msgstr "波蘭嶼" - -#: conf/global_settings.py:110 -msgid "Portuguese" -msgstr "葡萄牙語" - -#: conf/global_settings.py:111 -msgid "Brazilian Portuguese" -msgstr "巴西葡萄牙語" - -#: conf/global_settings.py:112 -msgid "Romanian" -msgstr "羅馬尼亞語" - -#: conf/global_settings.py:113 -msgid "Russian" -msgstr "俄語" - -#: conf/global_settings.py:114 -msgid "Slovak" -msgstr "斯洛伐克語" - -#: conf/global_settings.py:115 -msgid "Slovenian" -msgstr "斯洛維尼亞語" - -#: conf/global_settings.py:116 -msgid "Albanian" -msgstr "阿爾巴尼亞語" - -#: conf/global_settings.py:117 -msgid "Serbian" -msgstr "塞爾維亞語" - -#: conf/global_settings.py:118 -msgid "Serbian Latin" -msgstr "塞爾維亞拉丁語" - -#: conf/global_settings.py:119 -msgid "Swedish" -msgstr "瑞典語" - -#: conf/global_settings.py:120 -msgid "Swahili" -msgstr "斯瓦希裡(Swahili)" - -#: conf/global_settings.py:121 -msgid "Tamil" -msgstr "坦米爾語" - -#: conf/global_settings.py:122 -msgid "Telugu" -msgstr "泰盧固語" - -#: conf/global_settings.py:123 -msgid "Thai" -msgstr "泰語" - -#: conf/global_settings.py:124 -msgid "Turkish" -msgstr "土耳其語" - -#: conf/global_settings.py:125 -msgid "Tatar" -msgstr "韃靼(Tatar)" - -#: conf/global_settings.py:126 -msgid "Udmurt" -msgstr "" - -#: conf/global_settings.py:127 -msgid "Ukrainian" -msgstr "烏克蘭語" - -#: conf/global_settings.py:128 -msgid "Urdu" -msgstr "烏爾都語(Urdu)" - -#: conf/global_settings.py:129 -msgid "Vietnamese" -msgstr "越南語" - -#: conf/global_settings.py:130 conf/global_settings.py:131 -msgid "Simplified Chinese" -msgstr "簡體中文" - -#: conf/global_settings.py:132 conf/global_settings.py:133 -msgid "Traditional Chinese" -msgstr "繁體中文" - -#: contrib/sitemaps/apps.py:8 -msgid "Site Maps" -msgstr "" - -#: contrib/staticfiles/apps.py:8 -msgid "Static Files" -msgstr "" - -#: contrib/syndication/apps.py:8 -msgid "Syndication" -msgstr "" - -#: contrib/webdesign/apps.py:8 -msgid "Web Design" -msgstr "" - -#: core/validators.py:21 -msgid "Enter a valid value." -msgstr "輸入有效的值" - -#: core/validators.py:77 forms/fields.py:675 -msgid "Enter a valid URL." -msgstr "輸入有效的URL" - -#: core/validators.py:115 -msgid "Enter a valid integer." -msgstr "" - -#: core/validators.py:120 -msgid "Enter a valid email address." -msgstr "輸入有效的電子郵件地址。" - -#: core/validators.py:185 -msgid "" -"Enter a valid 'slug' consisting of letters, numbers, underscores or hyphens." -msgstr "輸入一個有效的 'slug'，由字母、數字、底線與連字號組成。" - -#: core/validators.py:188 core/validators.py:207 -msgid "Enter a valid IPv4 address." -msgstr "輸入有效的 IPv4 位址。" - -#: core/validators.py:193 core/validators.py:208 -msgid "Enter a valid IPv6 address." -msgstr "請輸入有效的 IPv6 位址。" - -#: core/validators.py:203 core/validators.py:206 -msgid "Enter a valid IPv4 or IPv6 address." -msgstr "請輸入有效的 IPv4 或 IPv6 位址。" - -#: core/validators.py:229 db/models/fields/__init__.py:1070 -msgid "Enter only digits separated by commas." -msgstr "輸入以逗號分隔的數字。" - -#: core/validators.py:236 -#, python-format -msgid "Ensure this value is %(limit_value)s (it is %(show_value)s)." -msgstr "確認這個是否為 %(limit_value)s (目前是 %(show_value)s)." - -#: core/validators.py:255 -#, python-format -msgid "Ensure this value is less than or equal to %(limit_value)s." -msgstr "確認這個數值是否小於或等於 %(limit_value)s。" - -#: core/validators.py:262 -#, python-format -msgid "Ensure this value is greater than or equal to %(limit_value)s." -msgstr "確認這個數值是否大於或等於 %(limit_value)s。" - -#: core/validators.py:271 -#, python-format -msgid "" -"Ensure this value has at least %(limit_value)d character (it has " -"%(show_value)d)." -msgid_plural "" -"Ensure this value has at least %(limit_value)d characters (it has " -"%(show_value)d)." -msgstr[0] "" - -#: core/validators.py:282 -#, python-format -msgid "" -"Ensure this value has at most %(limit_value)d character (it has " -"%(show_value)d)." -msgid_plural "" -"Ensure this value has at most %(limit_value)d characters (it has " -"%(show_value)d)." -msgstr[0] "" - -#: db/models/base.py:975 forms/models.py:718 -msgid "and" -msgstr "和" - -#: db/models/base.py:977 -#, python-format -msgid "%(model_name)s with this %(field_labels)s already exists." -msgstr "" - -#: db/models/fields/__init__.py:104 -#, python-format -msgid "Value %(value)r is not a valid choice." -msgstr "" - -#: db/models/fields/__init__.py:105 -msgid "This field cannot be null." -msgstr "這個值不能是 null。" - -#: db/models/fields/__init__.py:106 -msgid "This field cannot be blank." -msgstr "這個欄位不能留白" - -#: db/models/fields/__init__.py:107 -#, python-format -msgid "%(model_name)s with this %(field_label)s already exists." -msgstr "這個 %(field_label)s 在 %(model_name)s 已經存在。" - -#. Translators: The 'lookup_type' is one of 'date', 'year' or 'month'. -#. Eg: "Title must be unique for pub_date year" -#: db/models/fields/__init__.py:111 -#, python-format -msgid "" -"%(field_label)s must be unique for %(date_field_label)s %(lookup_type)s." -msgstr "" - -#: db/models/fields/__init__.py:116 -#, python-format -msgid "Field of type: %(field_type)s" -msgstr "欄位型態： %(field_type)s" - -#: db/models/fields/__init__.py:847 db/models/fields/__init__.py:1573 -msgid "Integer" -msgstr "整數" - -#: db/models/fields/__init__.py:851 db/models/fields/__init__.py:1571 -#, python-format -msgid "'%(value)s' value must be an integer." -msgstr "" - -#: db/models/fields/__init__.py:926 -#, python-format -msgid "'%(value)s' value must be either True or False." -msgstr "" - -#: db/models/fields/__init__.py:928 -msgid "Boolean (Either True or False)" -msgstr "布林值 (True 或 False)" - -#: db/models/fields/__init__.py:1004 -#, python-format -msgid "String (up to %(max_length)s)" -msgstr "字串 (最長到 %(max_length)s 個字)" - -#: db/models/fields/__init__.py:1065 -msgid "Comma-separated integers" -msgstr "逗號分隔的整數" - -#: db/models/fields/__init__.py:1080 -#, python-format -msgid "" -"'%(value)s' value has an invalid date format. It must be in YYYY-MM-DD " -"format." -msgstr "" - -#: db/models/fields/__init__.py:1082 db/models/fields/__init__.py:1189 -#, python-format -msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD) but it is an invalid " -"date." -msgstr "" - -#: db/models/fields/__init__.py:1085 -msgid "Date (without time)" -msgstr "日期 (不包括時間)" - -#: db/models/fields/__init__.py:1187 -#, python-format -msgid "" -"'%(value)s' value has an invalid format. It must be in YYYY-MM-DD HH:MM[:ss[." -"uuuuuu]][TZ] format." -msgstr "" - -#: db/models/fields/__init__.py:1191 -#, python-format -msgid "" -"'%(value)s' value has the correct format (YYYY-MM-DD HH:MM[:ss[.uuuuuu]]" -"[TZ]) but it is an invalid date/time." -msgstr "" - -#: db/models/fields/__init__.py:1195 -msgid "Date (with time)" -msgstr "日期 (包括時間)" - -#: db/models/fields/__init__.py:1297 -#, python-format -msgid "'%(value)s' value must be a decimal number." -msgstr "" - -#: db/models/fields/__init__.py:1299 -msgid "Decimal number" -msgstr "十進位數(小數可)" - -#: db/models/fields/__init__.py:1444 -msgid "Email address" -msgstr "電子郵件地址" - -#: db/models/fields/__init__.py:1470 -msgid "File path" -msgstr "檔案路徑" - -#: db/models/fields/__init__.py:1537 -#, python-format -msgid "'%(value)s' value must be a float." -msgstr "" - -#: db/models/fields/__init__.py:1539 -msgid "Floating point number" -msgstr "浮點數" - -#: db/models/fields/__init__.py:1623 -msgid "Big (8 byte) integer" -msgstr "大整數(8位元組)" - -#: db/models/fields/__init__.py:1638 -msgid "IPv4 address" -msgstr "IPv4 地址" - -#: db/models/fields/__init__.py:1668 -msgid "IP address" -msgstr "IP 位址" - -#: db/models/fields/__init__.py:1747 -#, python-format -msgid "'%(value)s' value must be either None, True or False." -msgstr "" - -#: db/models/fields/__init__.py:1749 -msgid "Boolean (Either True, False or None)" -msgstr "布林值 (True, False 或 None)" - -#: db/models/fields/__init__.py:1809 -msgid "Positive integer" -msgstr "正整數" - -#: db/models/fields/__init__.py:1821 -msgid "Positive small integer" -msgstr "正小整數" - -#: db/models/fields/__init__.py:1834 -#, python-format -msgid "Slug (up to %(max_length)s)" -msgstr "可讀網址 (長度最多 %(max_length)s)" - -#: db/models/fields/__init__.py:1863 -msgid "Small integer" -msgstr "小整數" - -#: db/models/fields/__init__.py:1870 -msgid "Text" -msgstr "文字" - -#: db/models/fields/__init__.py:1893 -#, python-format -msgid "" -"'%(value)s' value has an invalid format. It must be in HH:MM[:ss[.uuuuuu]] " -"format." -msgstr "" - -#: db/models/fields/__init__.py:1895 -#, python-format -msgid "" -"'%(value)s' value has the correct format (HH:MM[:ss[.uuuuuu]]) but it is an " -"invalid time." -msgstr "" - -#: db/models/fields/__init__.py:1898 -msgid "Time" -msgstr "時間" - -#: db/models/fields/__init__.py:1977 -msgid "URL" -msgstr "URL" - -#: db/models/fields/__init__.py:2000 -msgid "Raw binary data" -msgstr "原始二進制數據" - -#: db/models/fields/files.py:225 -msgid "File" -msgstr "檔案" - -#: db/models/fields/files.py:375 -msgid "Image" -msgstr "影像" - -#: db/models/fields/related.py:1580 -#, python-format -msgid "%(model)s instance with pk %(pk)r does not exist." -msgstr "" - -#: db/models/fields/related.py:1582 -msgid "Foreign Key (type determined by related field)" -msgstr "外鍵 (型態由關連欄位決定)" - -#: db/models/fields/related.py:1773 -msgid "One-to-one relationship" -msgstr "一對一關連" - -#: db/models/fields/related.py:1843 -msgid "Many-to-many relationship" -msgstr "多對多關連" - -#: forms/fields.py:55 -msgid "This field is required." -msgstr "這個欄位是必須的。" - -#: forms/fields.py:236 -msgid "Enter a whole number." -msgstr "輸入整數" - -#: forms/fields.py:279 forms/fields.py:316 -msgid "Enter a number." -msgstr "輸入一個數字" - -#: forms/fields.py:318 -#, python-format -msgid "Ensure that there are no more than %(max)s digit in total." -msgid_plural "Ensure that there are no more than %(max)s digits in total." -msgstr[0] "確認數字全長不超過 %(max)s 位。" - -#: forms/fields.py:322 -#, python-format -msgid "Ensure that there are no more than %(max)s decimal place." -msgid_plural "Ensure that there are no more than %(max)s decimal places." -msgstr[0] "" - -#: forms/fields.py:326 -#, python-format -msgid "" -"Ensure that there are no more than %(max)s digit before the decimal point." -msgid_plural "" -"Ensure that there are no more than %(max)s digits before the decimal point." -msgstr[0] "" - -#: forms/fields.py:437 forms/fields.py:1139 -msgid "Enter a valid date." -msgstr "輸入有效的日期" - -#: forms/fields.py:461 forms/fields.py:1140 -msgid "Enter a valid time." -msgstr "輸入有效的時間" - -#: forms/fields.py:483 -msgid "Enter a valid date/time." -msgstr "輸入有效的日期/時間" - -#: forms/fields.py:564 -msgid "No file was submitted. Check the encoding type on the form." -msgstr "沒有檔案被送出。請檢查表單的編碼類型。" - -#: forms/fields.py:565 -msgid "No file was submitted." -msgstr "沒有檔案送出" - -#: forms/fields.py:566 -msgid "The submitted file is empty." -msgstr "送出的檔案是空的。" - -#: forms/fields.py:568 -#, python-format -msgid "Ensure this filename has at most %(max)d character (it has %(length)d)." -msgid_plural "" -"Ensure this filename has at most %(max)d characters (it has %(length)d)." -msgstr[0] "" - -#: forms/fields.py:571 -msgid "Please either submit a file or check the clear checkbox, not both." -msgstr "請提交一個檔案或確認清除核可項, 不能兩者都做。" - -#: forms/fields.py:632 -msgid "" -"Upload a valid image. The file you uploaded was either not an image or a " -"corrupted image." -msgstr "上傳一個有效的圖檔。你上傳的檔案為非圖片，不然就是損壞的圖檔。" - -#: forms/fields.py:782 forms/fields.py:871 forms/models.py:1192 -#, python-format -msgid "Select a valid choice. %(value)s is not one of the available choices." -msgstr "請選擇有效的項目, %(value)s 不是一個可用的選擇。" - -#: forms/fields.py:872 forms/fields.py:987 forms/models.py:1191 -msgid "Enter a list of values." -msgstr "輸入一個列表的值" - -#: forms/fields.py:988 -msgid "Enter a complete value." -msgstr "" - -#. Translators: This is the default suffix added to form field labels -#: forms/forms.py:122 -msgid ":" -msgstr ":" - -#: forms/forms.py:192 -#, python-format -msgid "(Hidden field %(name)s) %(error)s" -msgstr "" - -#. Translators: If found as last label character, these punctuation -#. characters will prevent the default label_suffix to be appended to the -#. label -#: forms/forms.py:620 -msgid ":?.!" -msgstr ":?.!" - -#: forms/formsets.py:95 -msgid "ManagementForm data is missing or has been tampered with" -msgstr "" - -#: forms/formsets.py:332 -#, python-format -msgid "Please submit %d or fewer forms." -msgid_plural "Please submit %d or fewer forms." -msgstr[0] "" - -#: forms/formsets.py:339 -#, python-format -msgid "Please submit %d or more forms." -msgid_plural "Please submit %d or more forms." -msgstr[0] "" - -#: forms/formsets.py:367 forms/formsets.py:369 -msgid "Order" -msgstr "排序" - -#: forms/formsets.py:371 -msgid "Delete" -msgstr "刪除" - -#: forms/models.py:712 -#, python-format -msgid "Please correct the duplicate data for %(field)s." -msgstr "請修正 %(field)s 的重覆資料" - -#: forms/models.py:716 -#, python-format -msgid "Please correct the duplicate data for %(field)s, which must be unique." -msgstr "請修正 %(field)s 的重覆資料, 必須為唯一值" - -#: forms/models.py:722 -#, python-format -msgid "" -"Please correct the duplicate data for %(field_name)s which must be unique " -"for the %(lookup)s in %(date_field)s." -msgstr "" -"請修正 %(field_name)s 重複資料, %(date_field)s 的 %(lookup)s 必須是唯一值。" - -#: forms/models.py:730 -msgid "Please correct the duplicate values below." -msgstr "請修正下方重覆的數值" - -#: forms/models.py:1028 -msgid "The inline foreign key did not match the parent instance primary key." -msgstr "內含的外鍵無法連接到對應的上層實體主鍵。" - -#: forms/models.py:1094 -msgid "Select a valid choice. That choice is not one of the available choices." -msgstr "選擇有效的選項： 此選擇不在可用的選項中。" - -#: forms/models.py:1194 -#, python-format -msgid "\"%(pk)s\" is not a valid value for a primary key." -msgstr "\"%(pk)s\" 不是一個主鍵的有效資料。" - -#: forms/models.py:1205 -msgid "" -"Hold down \"Control\", or \"Command\" on a Mac, to select more than one." -msgstr "按住 \"Control\", 或者在 Mac 上按 \"Command\", 以選取更多值" - -#: forms/utils.py:148 -#, python-format -msgid "" -"%(datetime)s couldn't be interpreted in time zone %(current_timezone)s; it " -"may be ambiguous or it may not exist." -msgstr "" -"%(datetime)s 無法被轉換成 %(current_timezone)s 時區格式; 可能是不符格式或不存" -"在。" - -#: forms/widgets.py:350 -msgid "Currently" -msgstr "目前" - -#: forms/widgets.py:351 -msgid "Change" -msgstr "變更" - -#: forms/widgets.py:352 -msgid "Clear" -msgstr "清除" - -#: forms/widgets.py:546 -msgid "Unknown" -msgstr "未知" - -#: forms/widgets.py:547 -msgid "Yes" -msgstr "是" - -#: forms/widgets.py:548 -msgid "No" -msgstr "否" - -#: template/defaultfilters.py:855 -msgid "yes,no,maybe" -msgstr "是、否、也許" - -#: template/defaultfilters.py:884 template/defaultfilters.py:896 -#, python-format -msgid "%(size)d byte" -msgid_plural "%(size)d bytes" -msgstr[0] "%(size)d 位元組" - -#: template/defaultfilters.py:898 -#, python-format -msgid "%s KB" -msgstr "%s KB" - -#: template/defaultfilters.py:900 -#, python-format -msgid "%s MB" -msgstr "%s MB" - -#: template/defaultfilters.py:902 -#, python-format -msgid "%s GB" -msgstr "%s GB" - -#: template/defaultfilters.py:904 -#, python-format -msgid "%s TB" -msgstr "%s TB" - -#: template/defaultfilters.py:906 -#, python-format -msgid "%s PB" -msgstr "%s PB" - -#: utils/dateformat.py:59 -msgid "p.m." -msgstr "p.m." - -#: utils/dateformat.py:60 -msgid "a.m." -msgstr "a.m." - -#: utils/dateformat.py:65 -msgid "PM" -msgstr "PM" - -#: utils/dateformat.py:66 -msgid "AM" -msgstr "AM" - -#: utils/dateformat.py:149 -msgid "midnight" -msgstr "午夜" - -#: utils/dateformat.py:151 -msgid "noon" -msgstr "中午" - -#: utils/dates.py:6 -msgid "Monday" -msgstr "星期一" - -#: utils/dates.py:6 -msgid "Tuesday" -msgstr "星期二" - -#: utils/dates.py:6 -msgid "Wednesday" -msgstr "星期三" - -#: utils/dates.py:6 -msgid "Thursday" -msgstr "星期四" - -#: utils/dates.py:6 -msgid "Friday" -msgstr "星期五" - -#: utils/dates.py:7 -msgid "Saturday" -msgstr "星期六" - -#: utils/dates.py:7 -msgid "Sunday" -msgstr "星期日" - -#: utils/dates.py:10 -msgid "Mon" -msgstr "星期一" - -#: utils/dates.py:10 -msgid "Tue" -msgstr "星期二" - -#: utils/dates.py:10 -msgid "Wed" -msgstr "星期三" - -#: utils/dates.py:10 -msgid "Thu" -msgstr "星期四" - -#: utils/dates.py:10 -msgid "Fri" -msgstr "星期五" - -#: utils/dates.py:11 -msgid "Sat" -msgstr "星期六" - -#: utils/dates.py:11 -msgid "Sun" -msgstr "星期日" - -#: utils/dates.py:18 -msgid "January" -msgstr "一月" - -#: utils/dates.py:18 -msgid "February" -msgstr "二月" - -#: utils/dates.py:18 -msgid "March" -msgstr "三月" - -#: utils/dates.py:18 -msgid "April" -msgstr "四月" - -#: utils/dates.py:18 -msgid "May" -msgstr "五月" - -#: utils/dates.py:18 -msgid "June" -msgstr "六月" - -#: utils/dates.py:19 -msgid "July" -msgstr "七月" - -#: utils/dates.py:19 -msgid "August" -msgstr "八月" - -#: utils/dates.py:19 -msgid "September" -msgstr "九月" - -#: utils/dates.py:19 -msgid "October" -msgstr "十月" - -#: utils/dates.py:19 -msgid "November" -msgstr "十一月" - -#: utils/dates.py:20 -msgid "December" -msgstr "十二月" - -#: utils/dates.py:23 -msgid "jan" -msgstr "一月" - -#: utils/dates.py:23 -msgid "feb" -msgstr "二月" - -#: utils/dates.py:23 -msgid "mar" -msgstr "三月" - -#: utils/dates.py:23 -msgid "apr" -msgstr "四月" - -#: utils/dates.py:23 -msgid "may" -msgstr "五月" - -#: utils/dates.py:23 -msgid "jun" -msgstr "六月" - -#: utils/dates.py:24 -msgid "jul" -msgstr "七月" - -#: utils/dates.py:24 -msgid "aug" -msgstr "八月" - -#: utils/dates.py:24 -msgid "sep" -msgstr "九月" - -#: utils/dates.py:24 -msgid "oct" -msgstr "十月" - -#: utils/dates.py:24 -msgid "nov" -msgstr "十一月" - -#: utils/dates.py:24 -msgid "dec" -msgstr "十二月" - -#: utils/dates.py:31 -msgctxt "abbrev. month" -msgid "Jan." -msgstr "一月" - -#: utils/dates.py:32 -msgctxt "abbrev. month" -msgid "Feb." -msgstr "二月" - -#: utils/dates.py:33 -msgctxt "abbrev. month" -msgid "March" -msgstr "三月" - -#: utils/dates.py:34 -msgctxt "abbrev. month" -msgid "April" -msgstr "四月" - -#: utils/dates.py:35 -msgctxt "abbrev. month" -msgid "May" -msgstr "五月" - -#: utils/dates.py:36 -msgctxt "abbrev. month" -msgid "June" -msgstr "六月" - -#: utils/dates.py:37 -msgctxt "abbrev. month" -msgid "July" -msgstr "七月" - -#: utils/dates.py:38 -msgctxt "abbrev. month" -msgid "Aug." -msgstr "八月" - -#: utils/dates.py:39 -msgctxt "abbrev. month" -msgid "Sept." -msgstr "九月" - -#: utils/dates.py:40 -msgctxt "abbrev. month" -msgid "Oct." -msgstr "十月" - -#: utils/dates.py:41 -msgctxt "abbrev. month" -msgid "Nov." -msgstr "十一月" - -#: utils/dates.py:42 -msgctxt "abbrev. month" -msgid "Dec." -msgstr "十二月" - -#: utils/dates.py:45 -msgctxt "alt. month" -msgid "January" -msgstr "一月" - -#: utils/dates.py:46 -msgctxt "alt. month" -msgid "February" -msgstr "二月" - -#: utils/dates.py:47 -msgctxt "alt. month" -msgid "March" -msgstr "三月" - -#: utils/dates.py:48 -msgctxt "alt. month" -msgid "April" -msgstr "四月" - -#: utils/dates.py:49 -msgctxt "alt. month" -msgid "May" -msgstr "五月" - -#: utils/dates.py:50 -msgctxt "alt. month" -msgid "June" -msgstr "六月" - -#: utils/dates.py:51 -msgctxt "alt. month" -msgid "July" -msgstr "七月" - -#: utils/dates.py:52 -msgctxt "alt. month" -msgid "August" -msgstr "八月" - -#: utils/dates.py:53 -msgctxt "alt. month" -msgid "September" -msgstr "九月" - -#: utils/dates.py:54 -msgctxt "alt. month" -msgid "October" -msgstr "十月" - -#: utils/dates.py:55 -msgctxt "alt. month" -msgid "November" -msgstr "十一月" - -#: utils/dates.py:56 -msgctxt "alt. month" -msgid "December" -msgstr "十二月" - -#: utils/ipv6.py:10 -msgid "This is not a valid IPv6 address." -msgstr "" - -#: utils/text.py:76 -#, python-format -msgctxt "String to return when truncating text" -msgid "%(truncated_text)s..." -msgstr "%(truncated_text)s..." - -#: utils/text.py:245 -msgid "or" -msgstr "或" - -#. Translators: This string is used as a separator between list elements -#: utils/text.py:264 utils/timesince.py:57 -msgid ", " -msgstr ", " - -#: utils/timesince.py:25 -#, python-format -msgid "%d year" -msgid_plural "%d years" -msgstr[0] "%d 年" - -#: utils/timesince.py:26 -#, python-format -msgid "%d month" -msgid_plural "%d months" -msgstr[0] "%d 月" - -#: utils/timesince.py:27 -#, python-format -msgid "%d week" -msgid_plural "%d weeks" -msgstr[0] "%d 週" - -#: utils/timesince.py:28 -#, python-format -msgid "%d day" -msgid_plural "%d days" -msgstr[0] "%d 日" - -#: utils/timesince.py:29 -#, python-format -msgid "%d hour" -msgid_plural "%d hours" -msgstr[0] "%d 時" - -#: utils/timesince.py:30 -#, python-format -msgid "%d minute" -msgid_plural "%d minutes" -msgstr[0] "%d 分" - -#: utils/timesince.py:46 -msgid "0 minutes" -msgstr "0 分" - -#: views/csrf.py:105 -msgid "Forbidden" -msgstr "" - -#: views/csrf.py:106 -msgid "CSRF verification failed. Request aborted." -msgstr "" - -#: views/csrf.py:110 -msgid "" -"You are seeing this message because this HTTPS site requires a 'Referer " -"header' to be sent by your Web browser, but none was sent. This header is " -"required for security reasons, to ensure that your browser is not being " -"hijacked by third parties." -msgstr "" - -#: views/csrf.py:115 -msgid "" -"If you have configured your browser to disable 'Referer' headers, please re-" -"enable them, at least for this site, or for HTTPS connections, or for 'same-" -"origin' requests." -msgstr "" - -#: views/csrf.py:120 -msgid "" -"You are seeing this message because this site requires a CSRF cookie when " -"submitting forms. This cookie is required for security reasons, to ensure " -"that your browser is not being hijacked by third parties." -msgstr "" - -#: views/csrf.py:125 -msgid "" -"If you have configured your browser to disable cookies, please re-enable " -"them, at least for this site, or for 'same-origin' requests." -msgstr "" - -#: views/csrf.py:129 -msgid "More information is available with DEBUG=True." -msgstr "" - -#: views/generic/dates.py:43 -msgid "No year specified" -msgstr "不指定年份" - -#: views/generic/dates.py:99 -msgid "No month specified" -msgstr "不指定月份" - -#: views/generic/dates.py:158 -msgid "No day specified" -msgstr "不指定日期" - -#: views/generic/dates.py:214 -msgid "No week specified" -msgstr "不指定週數" - -#: views/generic/dates.py:369 views/generic/dates.py:397 -#, python-format -msgid "No %(verbose_name_plural)s available" -msgstr "%(verbose_name_plural)s 無法使用" - -#: views/generic/dates.py:650 -#, python-format -msgid "" -"Future %(verbose_name_plural)s not available because %(class_name)s." -"allow_future is False." -msgstr "" -"未來的 %(verbose_name_plural)s 不可用，因 %(class_name)s.allow_future 為 " -"False." - -#: views/generic/dates.py:682 -#, python-format -msgid "Invalid date string '%(datestr)s' given format '%(format)s'" -msgstr "無效的日期字串 '%(datestr)s' 可接受格式 '%(format)s'" - -#: views/generic/detail.py:54 -#, python-format -msgid "No %(verbose_name)s found matching the query" -msgstr "無 %(verbose_name)s 符合本次搜尋" - -#: views/generic/list.py:62 -msgid "Page is not 'last', nor can it be converted to an int." -msgstr "頁面不是最後一頁，也無法被轉換為整數。" - -#: views/generic/list.py:67 -#, python-format -msgid "Invalid page (%(page_number)s): %(message)s" -msgstr "無效的頁面 (%(page_number)s): %(message)s" - -#: views/generic/list.py:158 -#, python-format -msgid "Empty list and '%(class_name)s.allow_empty' is False." -msgstr "為空list且 '%(class_name)s.allow_empty' 為False." - -#: views/static.py:54 -msgid "Directory indexes are not allowed here." -msgstr "這裡不允許目錄索引。" - -#: views/static.py:56 -#, python-format -msgid "\"%(path)s\" does not exist" -msgstr "\"%(path)s\" 路徑不存在" - -#: views/static.py:97 -#, python-format -msgid "Index of %(directory)s" -msgstr "%(directory)s 的索引" diff --git a/django/conf/locale/zh_TW/__init__.py b/django/conf/locale/zh_TW/__init__.py deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/django/conf/locale/zh_TW/formats.py b/django/conf/locale/zh_TW/formats.py deleted file mode 100644 index f855dec5b2..0000000000 --- a/django/conf/locale/zh_TW/formats.py +++ /dev/null @@ -1,45 +0,0 @@ -# -*- encoding: utf-8 -*- -# This file is distributed under the same license as the Django package. -# -from __future__ import unicode_literals - -# The *_FORMAT strings use the Django date format syntax, -# see http://docs.djangoproject.com/en/dev/ref/templates/builtins/#date -DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 -TIME_FORMAT = 'H:i' # 20:45 -DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 -YEAR_MONTH_FORMAT = 'Y年n月' # 2016年9月 -MONTH_DAY_FORMAT = 'm月j日' # 9月5日 -SHORT_DATE_FORMAT = 'Y年n月j日' # 2016年9月5日 -SHORT_DATETIME_FORMAT = 'Y年n月j日 H:i' # 2016年9月5日 20:45 -FIRST_DAY_OF_WEEK = 1 # 星期一 (Monday) - -# The *_INPUT_FORMATS strings use the Python strftime format syntax, -# see http://docs.python.org/library/datetime.html#strftime-strptime-behavior -DATE_INPUT_FORMATS = ( - '%Y/%m/%d', # '2016/09/05' - '%Y-%m-%d', # '2016-09-05' - '%Y年%n月%j日', # '2016年9月5日' -) - -TIME_INPUT_FORMATS = ( - '%H:%M', # '20:45' - '%H:%M:%S', # '20:45:29' - '%H:%M:%S.%f', # '20:45:29.000200' -) - -DATETIME_INPUT_FORMATS = ( - '%Y/%m/%d %H:%M', # '2016/09/05 20:45' - '%Y-%m-%d %H:%M', # '2016-09-05 20:45' - '%Y年%n月%j日 %H:%M', # '2016年9月5日 14:45' - '%Y/%m/%d %H:%M:%S', # '2016/09/05 20:45:29' - '%Y-%m-%d %H:%M:%S', # '2016-09-05 20:45:29' - '%Y年%n月%j日 %H:%M:%S', # '2016年9月5日 20:45:29' - '%Y/%m/%d %H:%M:%S.%f', # '2016/09/05 20:45:29.000200' - '%Y-%m-%d %H:%M:%S.%f', # '2016-09-05 20:45:29.000200' - '%Y年%n月%j日 %H:%n:%S.%f', # '2016年9月5日 20:45:29.000200' -) - -DECIMAL_SEPARATOR = '.' -THOUSAND_SEPARATOR = '' -NUMBER_GROUPING = 4 diff --git a/django/utils/translation/trans_real.py b/django/utils/translation/trans_real.py index 4e6a359df2..18bb84b1de 100644 --- a/django/utils/translation/trans_real.py +++ b/django/utils/translation/trans_real.py @@ -15,7 +15,6 @@ from django.conf.locale import LANG_INFO from django.core.exceptions import AppRegistryNotReady from django.core.signals import setting_changed from django.dispatch import receiver -from django.utils.deprecation import RemovedInDjango19Warning from django.utils.encoding import force_text from django.utils._os import upath from django.utils.safestring import mark_safe, SafeData @@ -46,12 +45,6 @@ language_code_re = re.compile(r'^[a-z]{1,8}(?:-[a-z0-9]{1,8})*$', re.IGNORECASE) language_code_prefix_re = re.compile(r'^/([\w-]+)(/|$)') -# some browsers use deprecated locales. refs #18419 -_DJANGO_DEPRECATED_LOCALES = { - 'zh-cn': 'zh-hans', - 'zh-tw': 'zh-hant', -} - @receiver(setting_changed) def reset_cache(**kwargs): @@ -213,11 +206,6 @@ def activate(language): """ if not language: return - if language in _DJANGO_DEPRECATED_LOCALES: - msg = ("The use of the language code '%s' is deprecated. " - "Please use the '%s' translation instead.") - warnings.warn(msg % (language, _DJANGO_DEPRECATED_LOCALES[language]), - RemovedInDjango19Warning, stacklevel=2) _active.value = translation(language) diff --git a/tests/deprecation/tests.py b/tests/deprecation/tests.py index 2d9a9beb69..ccc4f2351b 100644 --- a/tests/deprecation/tests.py +++ b/tests/deprecation/tests.py @@ -4,9 +4,9 @@ import os import unittest import warnings -from django.test import SimpleTestCase, override_settings +from django.test import SimpleTestCase from django.test.utils import reset_warning_registry -from django.utils import six, translation +from django.utils import six from django.utils.deprecation import RenameMethodsBase from django.utils.encoding import force_text @@ -175,24 +175,6 @@ class RenameMethodsTests(SimpleTestCase): ]) -@override_settings(USE_I18N=True) -class DeprecatedChineseLanguageCodes(SimpleTestCase): - def test_deprecation_warning(self): - with warnings.catch_warnings(record=True) as recorded: - warnings.simplefilter('always') - with translation.override('zh-cn'): - pass - with translation.override('zh-tw'): - pass - msgs = [str(warning.message) for warning in recorded] - self.assertEqual(msgs, [ - "The use of the language code 'zh-cn' is deprecated. " - "Please use the 'zh-hans' translation instead.", - "The use of the language code 'zh-tw' is deprecated. " - "Please use the 'zh-hant' translation instead.", - ]) - - class DeprecatingSimpleTestCaseUrls(unittest.TestCase): def test_deprecation(self): diff --git a/tests/i18n/tests.py b/tests/i18n/tests.py index a0df8daddf..f3ae0288c2 100644 --- a/tests/i18n/tests.py +++ b/tests/i18n/tests.py @@ -972,11 +972,11 @@ class MiscTests(TestCase): self.assertEqual(g(r), 'es') # This tests the following scenario: there isn't a main language (zh) - # translation of Django but there is a translation to variation (zh_CN) - # the user sets zh-cn as the preferred language, it should be selected + # translation of Django but there is a translation to variation (zh-hans) + # the user sets zh-hans as the preferred language, it should be selected # by Django without falling back nor ignoring it. - r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-cn,de'} - self.assertEqual(g(r), 'zh-cn') + r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-hans,de'} + self.assertEqual(g(r), 'zh-hans') r.META = {'HTTP_ACCEPT_LANGUAGE': 'NL'} self.assertEqual('nl', g(r)) @@ -1022,32 +1022,6 @@ class MiscTests(TestCase): r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-tw,en'} self.assertEqual(g(r), 'zh-hant') - @override_settings( - LANGUAGES=( - ('en', 'English'), - ('zh-cn', 'Simplified Chinese'), - ('zh-hans', 'Simplified Chinese'), - ('zh-hant', 'Traditional Chinese'), - ('zh-tw', 'Traditional Chinese'), - ) - ) - def test_backwards_compatibility(self): - """ - While the old chinese language codes are being deprecated, they should - still work as before the new language codes were introduced. - - refs #18419 -- this is explicitly for backwards compatibility and - should be removed in Django 1.9 - """ - g = get_language_from_request - r = self.rf.get('/') - r.COOKIES = {} - r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-cn,en'} - self.assertEqual(g(r), 'zh-cn') - - r.META = {'HTTP_ACCEPT_LANGUAGE': 'zh-tw,en'} - self.assertEqual(g(r), 'zh-tw') - def test_special_fallback_language(self): """ Some languages may have special fallbacks that don't follow the simple @@ -1085,12 +1059,12 @@ class MiscTests(TestCase): self.assertEqual(g(r), 'es') # This tests the following scenario: there isn't a main language (zh) - # translation of Django but there is a translation to variation (zh_CN) - # the user sets zh-cn as the preferred language, it should be selected + # translation of Django but there is a translation to variation (zh-hans) + # the user sets zh-hans as the preferred language, it should be selected # by Django without falling back nor ignoring it. - r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'zh-cn'} + r.COOKIES = {settings.LANGUAGE_COOKIE_NAME: 'zh-hans'} r.META = {'HTTP_ACCEPT_LANGUAGE': 'de'} - self.assertEqual(g(r), 'zh-cn') + self.assertEqual(g(r), 'zh-hans') def test_get_language_from_path_real(self): g = trans_real.get_language_from_path @@ -1238,8 +1212,8 @@ class TestLanguageInfo(TestCase): """ li = get_language_info('zh-my') self.assertEqual(li['code'], 'zh-hans') - li = get_language_info('zh-cn') - self.assertEqual(li['code'], 'zh-cn') + li = get_language_info('zh-hans') + self.assertEqual(li['code'], 'zh-hans') class MultipleLocaleActivationTests(TestCase):