aboutsummaryrefslogtreecommitdiffstats
path: root/settings/l10n/zh_CN.json
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2016-07-01 11:36:35 +0200
committerLukas Reschke <lukas@owncloud.com>2016-07-01 11:36:35 +0200
commit179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch)
treef87a5586086635d4cbd18771b442ee771f79e441 /settings/l10n/zh_CN.json
parent8e002b61554308cb4d50570f715303a82136f0fa (diff)
parent2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff)
downloadnextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.tar.gz
nextcloud-server-179a355b2cd3dc489a54cc27fd717f67373d0b1e.zip
Merge remote-tracking branch 'upstream/master' into master-sync-upstream
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 ab4fa47531e..60aca425bb9 100644
--- a/settings/l10n/zh_CN.json
+++ b/settings/l10n/zh_CN.json
@@ -252,6 +252,7 @@
"Language" : "语言",
"Help translate" : "帮助翻译",
"Name" : "名称",
+ "Username" : "用户名",
"Get the apps to sync your files" : "安装应用进行文件同步",
"Desktop client" : "桌面客户端",
"Android app" : "Android 应用",
@@ -264,7 +265,6 @@
"Show user backend" : "显示用户后端",
"Send email to new user" : "发送电子邮件给新用户",
"Show email address" : "显示邮件地址",
- "Username" : "用户名",
"E-Mail" : "E-Mail",
"Create" : "创建",
"Admin Recovery Password" : "管理恢复密码",