diff options
| author | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-23 10:25:12 -0400 |
|---|---|---|
| committer | Michael Gapczynski <mtgap@owncloud.com> | 2013-05-23 10:25:12 -0400 |
| commit | 30330b4343b5bca82b95d9df4a13651c8e91063d (patch) | |
| tree | 68979fb843a309e43803935f53afe74fab2844e4 /apps/user_ldap/l10n/zh_CN.php | |
| parent | 3b6d850e592bbc6db9d67d25ee700c0730c84376 (diff) | |
| parent | 698862519de6b364da6c20a97d8c546204e80f3d (diff) | |
| download | nextcloud-server-30330b4343b5bca82b95d9df4a13651c8e91063d.tar.gz nextcloud-server-30330b4343b5bca82b95d9df4a13651c8e91063d.zip | |
Merge branch 'master' into move-storages
Conflicts:
tests/lib/files/view.php
Diffstat (limited to 'apps/user_ldap/l10n/zh_CN.php')
| -rw-r--r-- | apps/user_ldap/l10n/zh_CN.php | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/apps/user_ldap/l10n/zh_CN.php b/apps/user_ldap/l10n/zh_CN.php index 1911734805f..7b8389227ae 100644 --- a/apps/user_ldap/l10n/zh_CN.php +++ b/apps/user_ldap/l10n/zh_CN.php @@ -7,6 +7,8 @@ "Take over settings from recent server configuration?" => "从近期的服务器配置中导入设置？", "Keep settings?" => "保留设置吗？", "Cannot add server configuration" => "无法添加服务器配置", +"Success" => "成功", +"Error" => "错误", "Connection test succeeded" => "连接测试成功", "Connection test failed" => "连接测试失败", "Do you really want to delete the current Server Configuration?" => "您真的想要删除当前服务器配置吗？", |