diff options
| author | rvelices <rv-github@modusoptimus.com> | 2010-05-27 20:28:43 +0000 |
|---|---|---|
| committer | rvelices <rv-github@modusoptimus.com> | 2010-05-27 20:28:43 +0000 |
| commit | f0d6ec33ce231f77077ba6535ca8312286f9a40b (patch) | |
| tree | 471c42102ac8688b561858c6258c27b7ff3763f3 /language/zh_CN | |
| parent | 50cd8ed52300a8613971f0d9bc0e66f4ca293b7b (diff) | |
merge r6402 from trunk
removed unnecessary language key (Controversy) and potential sql fatal error in admin photo rating page
git-svn-id: http://piwigo.org/svn/branches/2.1@6403 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'language/zh_CN')
| -rw-r--r-- | language/zh_CN/admin.lang.php | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/language/zh_CN/admin.lang.php b/language/zh_CN/admin.lang.php index 800b9b6d7..279f72775 100644 --- a/language/zh_CN/admin.lang.php +++ b/language/zh_CN/admin.lang.php @@ -69,7 +69,6 @@ $lang['Category elements associated to the following categories: %s'] = '本类 $lang['Check for upgrade failed for unknown reasons.'] = '因未知原因导致更新检测失败.'; $lang['Check for upgrade'] = '检测更新'; $lang['Comments for all'] = '对所有成员进行评论'; -$lang['Controversy'] = '辩论'; $lang['Current name'] = '现用名'; $lang['Database'] = '数据库'; $lang['Deactivate'] = '注销'; |