summaryrefslogtreecommitdiffstats
path: root/core/l10n/zh_CN.php
diff options
context:
space:
mode:
authorJenkins for ownCloud <thomas.mueller@tmit.eu>2013-09-20 10:50:14 -0400
committerJenkins for ownCloud <thomas.mueller@tmit.eu>2013-09-20 10:50:14 -0400
commit5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6 (patch)
tree690208feef82d3a258f9f8f2c5140bf14374449c /core/l10n/zh_CN.php
parent8e26f291a7912ccc3520ac53af0ddf1da714fdbc (diff)
downloadnextcloud-server-5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6.tar.gz
nextcloud-server-5b95e7aa0f0487d7ddb07588c71d25cd973c2bb6.zip
[tx-robot] updated from transifex
Diffstat (limited to 'core/l10n/zh_CN.php')
-rw-r--r--core/l10n/zh_CN.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index ce61618111a..471aa735c48 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -51,6 +51,7 @@ $TRANSLATIONS = array(
"Yes" => "是",
"No" => "否",
"Ok" => "好",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定应用名称。",