diff options
author | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
---|---|---|
committer | Lukas Reschke <lukas@owncloud.com> | 2016-07-01 11:36:35 +0200 |
commit | 179a355b2cd3dc489a54cc27fd717f67373d0b1e (patch) | |
tree | f87a5586086635d4cbd18771b442ee771f79e441 /settings/l10n/zh_CN.js | |
parent | 8e002b61554308cb4d50570f715303a82136f0fa (diff) | |
parent | 2d2d2267f7f38ca29e7b87f40fae62261614b0d1 (diff) | |
download | nextcloud-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.js')
-rw-r--r-- | settings/l10n/zh_CN.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/l10n/zh_CN.js b/settings/l10n/zh_CN.js index 6243996d0cf..05f981d769d 100644 --- a/settings/l10n/zh_CN.js +++ b/settings/l10n/zh_CN.js @@ -254,6 +254,7 @@ OC.L10N.register( "Language" : "语言", "Help translate" : "帮助翻译", "Name" : "名称", + "Username" : "用户名", "Get the apps to sync your files" : "安装应用进行文件同步", "Desktop client" : "桌面客户端", "Android app" : "Android 应用", @@ -266,7 +267,6 @@ OC.L10N.register( "Show user backend" : "显示用户后端", "Send email to new user" : "发送电子邮件给新用户", "Show email address" : "显示邮件地址", - "Username" : "用户名", "E-Mail" : "E-Mail", "Create" : "创建", "Admin Recovery Password" : "管理恢复密码", |