summaryrefslogtreecommitdiffstats
path: root/core/l10n/zh_CN.php
diff options
context:
space:
mode:
Diffstat (limited to 'core/l10n/zh_CN.php')
-rw-r--r--core/l10n/zh_CN.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index ddcc902c8d7..04c4630b222 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -48,10 +48,11 @@ $TRANSLATIONS = array(
"last year" => "去年",
"years ago" => "年前",
"Choose" => "选择(&C)...",
-"Error loading file picker template" => "加载文件选择器模板出错",
"Yes" => "是",
"No" => "否",
"Ok" => "好",
+"_{count} file conflict_::_{count} file conflicts_" => array(""),
+"Cancel" => "取消",
"The object type is not specified." => "未指定对象类型。",
"Error" => "错误",
"The app name is not specified." => "未指定应用名称。",