summaryrefslogtreecommitdiffstats
path: root/settings/l10n/zh_CN.php
diff options
context:
space:
mode:
authorBjoern Schiessle <schiessle@owncloud.com>2013-08-17 13:15:22 +0200
committerBjoern Schiessle <schiessle@owncloud.com>2013-08-17 13:15:22 +0200
commitcabe92ef1240e171a812f5822ac69b4d7742fd71 (patch)
tree469e9089107d440da0c12c291abbd626d6d08b33 /settings/l10n/zh_CN.php
parent7adfc27cafa6f94962a33c158af9c45e71e012c5 (diff)
parentd3e2f31adad5eeaf415154dd2fb88cb9fec0b3c1 (diff)
downloadnextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.tar.gz
nextcloud-server-cabe92ef1240e171a812f5822ac69b4d7742fd71.zip
Merge branch 'master' into decrypt_files_again
Conflicts: apps/files_encryption/tests/keymanager.php
Diffstat (limited to 'settings/l10n/zh_CN.php')
-rw-r--r--settings/l10n/zh_CN.php4
1 files changed, 3 insertions, 1 deletions
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 47fcc54f430..5a42bf06754 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,4 +1,5 @@
-<?php $TRANSLATIONS = array(
+<?php
+$TRANSLATIONS = array(
"Unable to load list from App Store" => "无法从应用商店载入列表",
"Authentication error" => "认证出错",
"Your display name has been changed." => "您的显示名字已经改变",
@@ -103,3 +104,4 @@
"set new password" => "设置新密码",
"Default" => "默认"
);
+$PLURAL_FORMS = "nplurals=1; plural=0;";