diff options
author | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
---|---|---|
committer | Tom Needham <needham.thomas@gmail.com> | 2012-12-31 15:47:15 +0000 |
commit | 6eb194b70284d527a182756f2c7a21f3d7dc1fe8 (patch) | |
tree | e70635e44cc4fccbbde34bed1a01fd50fcd183cf /settings/l10n/zh_CN.GB2312.php | |
parent | 218a5ea89014322592bd8c4789d8500d42029b9f (diff) | |
parent | 329bddab481129b480ca187b694e507eff7fb125 (diff) | |
download | nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.tar.gz nextcloud-server-6eb194b70284d527a182756f2c7a21f3d7dc1fe8.zip |
Merge branch 'master' into ocs_api
Conflicts:
l10n/templates/core.pot
l10n/templates/files.pot
l10n/templates/files_encryption.pot
l10n/templates/files_external.pot
l10n/templates/files_sharing.pot
l10n/templates/files_versions.pot
l10n/templates/lib.pot
l10n/templates/settings.pot
l10n/templates/user_ldap.pot
l10n/templates/user_webdavauth.pot
Diffstat (limited to 'settings/l10n/zh_CN.GB2312.php')
-rw-r--r-- | settings/l10n/zh_CN.GB2312.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php index 4784ff7ff9d..6afcc1ecd56 100644 --- a/settings/l10n/zh_CN.GB2312.php +++ b/settings/l10n/zh_CN.GB2312.php @@ -22,14 +22,8 @@ "Select an App" => "选择一个程序", "See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序", "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>授权协议 <span class=\"author\"></span>", -"Documentation" => "文档", -"Managing Big Files" => "管理大文件", -"Ask a question" => "提一个问题", -"Problems connecting to help database." => "连接到帮助数据库时的问题", -"Go there manually." => "收到转到.", -"Answer" => "回答", -"Desktop and Mobile Syncing Clients" => "桌面和移动同步客户端", -"Download" => "下载", +"Clients" => "客户", +"Password" => "密码", "Your password was changed" => "您的密码以变更", "Unable to change your password" => "不能改变你的密码", "Current password" => "现在的密码", @@ -41,15 +35,11 @@ "Fill in an email address to enable password recovery" => "输入一个邮箱地址以激活密码恢复功能", "Language" => "语言", "Help translate" => "帮助翻译", -"use this address to connect to your ownCloud in your file manager" => "使用这个地址和你的文件管理器连接到你的ownCloud", "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">source code</a> is licensed under the <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>." => "由 <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud 社区</a>开发,<a href=\"https://github.com/owncloud\" target=\"_blank\">s源代码</a> 以 <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> 许可协议发布。", "Name" => "名字", -"Password" => "密码", "Groups" => "组", "Create" => "新建", -"Default Quota" => "默认限额", "Other" => "其他的", "Group Admin" => "群组管理员", -"Quota" => "限额", "Delete" => "删除" ); |