aboutsummaryrefslogtreecommitdiffstats
path: root/settings/l10n/zh_CN.json
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-06-26 12:55:05 +0200
committerLukas Reschke <lukas@owncloud.com>2016-06-26 12:55:05 +0200
commit7a9d60d87eb8e4414e5fe05830b088d426ff810d (patch)
tree0fc97a7eacfd071475afd8bc6d4372babacb5740 /settings/l10n/zh_CN.json
parent5387b942c44e05b87ba2a0fd54168f5278a31344 (diff)
parent52eab2a61a5d27b64fcd0440b91f854c052933a9 (diff)
downloadnextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.tar.gz
nextcloud-server-7a9d60d87eb8e4414e5fe05830b088d426ff810d.zip
Merge remote-tracking branch 'upstream/master' into master-upstream-sync
Diffstat (limited to 'settings/l10n/zh_CN.json')
-rw-r--r--settings/l10n/zh_CN.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/l10n/zh_CN.json b/settings/l10n/zh_CN.json
index 37ddc31729e..ab4fa47531e 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -249,9 +249,9 @@
"Current password" : "当前密码",
"New password" : "新密码",
"Change password" : "修改密码",
- "Name" : "名称",
"Language" : "语言",
"Help translate" : "帮助翻译",
+ "Name" : "名称",
"Get the apps to sync your files" : "安装应用进行文件同步",
"Desktop client" : "桌面客户端",
"Android app" : "Android 应用",