diff options
| author | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
|---|---|---|
| committer | Thomas Mueller <thomas.mueller@tmit.eu> | 2013-02-07 10:44:28 +0100 |
| commit | 5788d36c8d1e9869d8a645293805e3b0265ea238 (patch) | |
| tree | 80045c0eb1687652f956b3bdaccb1c765893d2e1 /settings/l10n/zh_CN.GB2312.php | |
| parent | 84f3c8b6cc1060203d807ee65545478ce34f93c4 (diff) | |
| parent | 35bd7a400d30fb27703d4fa02b107f9629845b7d (diff) | |
| download | nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.tar.gz nextcloud-server-5788d36c8d1e9869d8a645293805e3b0265ea238.zip | |
Merge branch 'master' into fixing-1354-master
Conflicts:
settings/admin.php
settings/templates/admin.php
Diffstat (limited to 'settings/l10n/zh_CN.GB2312.php')
| -rw-r--r-- | settings/l10n/zh_CN.GB2312.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php index 6a957518564..c7d73ae2ded 100644 --- a/settings/l10n/zh_CN.GB2312.php +++ b/settings/l10n/zh_CN.GB2312.php @@ -1,12 +1,12 @@ <?php $TRANSLATIONS = array( "Unable to load list from App Store" => "不能从App Store 中加载列表", +"Authentication error" => "认证错误", "Group already exists" => "群组已存在", "Unable to add group" => "未能添加群组", "Could not enable app. " => "未能启用应用", "Email saved" => "Email 保存了", "Invalid email" => "非法Email", "Unable to delete group" => "未能删除群组", -"Authentication error" => "认证错误", "Unable to delete user" => "未能删除用户", "Language changed" => "语言改变了", "Invalid request" => "非法请求", |