From e6bb59b69a8f67642aa164dfdde562150fc5cb80 Mon Sep 17 00:00:00 2001 From: zhoujie Date: Tue, 14 Feb 2017 13:49:00 +0800 Subject: [PATCH 1/2] add more translations for zh_CN --- include/config.inc.php | 2 +- translations/index.cfg | 4 ++-- translations/zh_CN/accesspathcreate.txt | 11 +++++----- translations/zh_CN/actions.txt | 6 +++--- translations/zh_CN/errors.txt | 4 ++++ translations/zh_CN/global.txt | 25 +++++++++++++++------- translations/zh_CN/groupcreate.txt | 13 ++++++------ translations/zh_CN/grouplist.txt | 2 +- translations/zh_CN/groupview.txt | 5 +++-- translations/zh_CN/index.txt | 6 +++--- translations/zh_CN/login.txt | 3 ++- translations/zh_CN/permissionassign.txt | 12 +++++------ translations/zh_CN/repositorycreate.txt | 25 +++++++++++++++------- translations/zh_CN/repositorylist.txt | 7 +++++-- translations/zh_CN/repositoryview.txt | 5 ++++- translations/zh_CN/roles.txt | 16 +++++++------- translations/zh_CN/settings.txt | 28 ++++++++++++++++++------- translations/zh_CN/userchangepass.txt | 2 +- translations/zh_CN/usercreate.txt | 3 ++- translations/zh_CN/userview.txt | 8 +++---- 20 files changed, 117 insertions(+), 70 deletions(-) diff --git a/include/config.inc.php b/include/config.inc.php index 28ae418..79d9eff 100644 --- a/include/config.inc.php +++ b/include/config.inc.php @@ -98,7 +98,7 @@ */ define("MAJOR_VERSION", "1"); define("MINOR_VERSION", "6.3"); -define("VERSION_EXTRA", "UNOFFICIAL"); +define("VERSION_EXTRA", "BETA"); /** * Constant ACL modules. diff --git a/translations/index.cfg b/translations/index.cfg index e93ac33..6e964a9 100644 --- a/translations/index.cfg +++ b/translations/index.cfg @@ -7,7 +7,7 @@ name=English author=Manuel Freiholz [zh_CN] -name=中文 +name=简体中文 author=Sean Chan [es_ES] @@ -15,7 +15,7 @@ name=Español author=Jacobo Domínguez [ja_JP] -name=Japanese +name=日本語 author=Shiro Sakurai [pt_BR] diff --git a/translations/zh_CN/accesspathcreate.txt b/translations/zh_CN/accesspathcreate.txt index 93809e7..9d24ac3 100644 --- a/translations/zh_CN/accesspathcreate.txt +++ b/translations/zh_CN/accesspathcreate.txt @@ -1,7 +1,8 @@ "Create access-path","创建访问路径" -"Create a new access-path to grant access to users and groups.","创建一个路径，用于授权用户和用户组.." +"Create a new access-path to grant access to users and groups.","创建新的访问路径，用于对用户和用户组配置访问权限。可以手动输入仓库路径或浏览仓库来创建。" "New access-path data","新路径数据" -"Path","路径" -"Syntax","注意语法:" -"An "/" as access path holds permissions over all repositories.","用 "/" 作为路径，会包含所有代码仓库的权限 ." -"Browse...","浏览..." +"Path","手动输入路径" +"Syntax","语法:" +"An "/" as access path holds permissions over all repositories.","用 "/" 作为路径，会包含所有仓库的权限 ." +"Browse...","浏览仓库" +"Back to overview","返回起始页" diff --git a/translations/zh_CN/actions.txt b/translations/zh_CN/actions.txt index eb194ca..73671ed 100644 --- a/translations/zh_CN/actions.txt +++ b/translations/zh_CN/actions.txt @@ -50,8 +50,8 @@ "The following group(s) could not been deleted","下列组无法被删除." # delete_repository.php -"You have to select at least one repository.","请至少选择一个代码仓库." -"The following repository(s) could not been deleted:","下列代码仓库无法被删除:" +"You have to select at least one repository.","请至少选择一个仓库." +"The following repository(s) could not been deleted:","下列仓库无法被删除:" # delete_user.php "The following user's has been deleted:","已删除下列用户:" @@ -68,7 +68,7 @@ # None # unassign_permission.php -"You have to select at least one access-path and one user or group.","请至少选择一个用户或组，和一个访问路径." +"You have to select at least one access-path and one user or group.","请至少选择一个用户、用户组，或访问路径." "The following Access-Path's has been unassigned:","已解除下列访问路径:" "You have no permission to unassign the following Access-Path's, they have been skipped:","您无权解除下列访问路径，已跳过" "Due to an unknown error, the following Access-Path's could not been handled:","未知错误,下列访问路径未被处理:" diff --git a/translations/zh_CN/errors.txt b/translations/zh_CN/errors.txt index 8f35926..2bfd6ff 100644 --- a/translations/zh_CN/errors.txt +++ b/translations/zh_CN/errors.txt @@ -1 +1,5 @@ "The requested module is turned off.","所请求的访问模块已被关闭." +"You do not have permission to access this page.","抱歉，您没有访问此页面的权限。" +"Required permissions:","需要的访问权限：" +"Module:","模块：" +"Action:","操作：" diff --git a/translations/zh_CN/global.txt b/translations/zh_CN/global.txt index 07e74ab..b678f1d 100644 --- a/translations/zh_CN/global.txt +++ b/translations/zh_CN/global.txt @@ -1,19 +1,18 @@ "Language","语言" -"Translated by","翻译者" -"Repositories","代码仓库" +"Repositories","仓库" "Users","用户" -"Groups","组" +"Groups","用户组" "Memberships","关系" "Access-Paths","访问路径" "Permissions","权限" "Role","角色" "Roles","角色组" -"Logout","登出" +"Logout","注销登录" "Login","登录" "Change password","修改密码" "Filter","查找" "User","用户" -"Group","组" +"Group","用户组" "Access-Path","访问路径" "Permission","权限" "Delete","删除" @@ -21,10 +20,20 @@ "Add","添加" "Assign","分配" "Unassign","解除" -"Create","新建" -"Are you sure?","确定?" +"Create","创建" +"Are you sure delete selected users?","准备删除选定的用户,是否继续?" +"Are you sure delete selected repositories?","准备删除选定的仓库,是否继续?" +"Are you sure delete selected groups?","准备删除选定的用户组,是否继续?" +"Are you sure delete selected accesspath?","准备删除选定的访问路径,是否继续?" "Settings","设置" "Backend","后端" "Synchronize","同步" "Welcome","欢迎" -"Show roles","选择角色" +"Show roles","了解用户角色" +"Home","首页" +"Session","会话" +"Exception list","错误" +"Message list","信息" +"Export dump","下载仓库备份文件" +"Description","描述" +"Options","选项" diff --git a/translations/zh_CN/groupcreate.txt b/translations/zh_CN/groupcreate.txt index cb6b8c7..7830130 100644 --- a/translations/zh_CN/groupcreate.txt +++ b/translations/zh_CN/groupcreate.txt @@ -1,6 +1,7 @@ -"Create group","创建组" -"Create a new group to grant access to the repositories for a range of users.","创建一个新组，用于对一群用户针对一个代码仓库的访问权限." -"New group data","新组数据" -"Group name","组名" -"Valid group names are","合法的组名为" -"Invalid group names are","不合法的组名为:" +"Create group","创建用户组" +"Create a new group to grant access to the repositories for a range of users.","创建一个新组，用于对一群用户针对一个仓库的访问权限." +"New group data","新用户组数据" +"Group name","用户组名" +"Valid group names are","合法的用户组名称示例" +"Invalid group names are","无效的用户组名称示例" +"Back to overview","回到起始页" diff --git a/translations/zh_CN/grouplist.txt b/translations/zh_CN/grouplist.txt index 786b911..a84d6b7 100644 --- a/translations/zh_CN/grouplist.txt +++ b/translations/zh_CN/grouplist.txt @@ -1,2 +1,2 @@ -"Group management","组管理" +"Group management","用户组管理" "Here you can see a list of all groups, which are defined in your subversion configuration.","在这里，您可以查看所有已从svn配置文件中定义的组." diff --git a/translations/zh_CN/groupview.txt b/translations/zh_CN/groupview.txt index 23651a2..82b191a 100644 --- a/translations/zh_CN/groupview.txt +++ b/translations/zh_CN/groupview.txt @@ -1,3 +1,4 @@ "On this page you can see all assigned users to this group.","在本页，您可以查看所有已授权到本组的用户." -"Users of group","组用户" -"Permissions of group","组权限" +"Users of group","此用户组包含用户" +"Permissions of group","此用户组权限" +"Groups of group","此用户组所属父用户组" diff --git a/translations/zh_CN/index.txt b/translations/zh_CN/index.txt index b46fd2b..b6c8c64 100644 --- a/translations/zh_CN/index.txt +++ b/translations/zh_CN/index.txt @@ -1,5 +1,5 @@ -"General information","相关信息" -"Logged in as","登录为" -"Application version","版本号" +"General information","一般信息" +"Logged in as","登录用户名" +"Application version","系统版本" "PHP version","PHP 版本" "Check for updates","更新版本" diff --git a/translations/zh_CN/login.txt b/translations/zh_CN/login.txt index a5691b8..963e144 100644 --- a/translations/zh_CN/login.txt +++ b/translations/zh_CN/login.txt @@ -1,3 +1,4 @@ -"You must login to get access to the application.","请登录." +"You must login to get access to the application.","您需要登录才能访问本应用系统." "Username","用户名" "Password","密码" +"Wrong user/password combination.","用户名或密码不正确。" \ No newline at end of file diff --git a/translations/zh_CN/permissionassign.txt b/translations/zh_CN/permissionassign.txt index fc7c783..78af542 100644 --- a/translations/zh_CN/permissionassign.txt +++ b/translations/zh_CN/permissionassign.txt @@ -1,9 +1,9 @@ -"Manage the user and group permissions for the different access-paths on this site.","在此站点上管理不同访问路径下的用户，用户组访问权限." +"Manage the user and group permissions for the different access-paths on this site.","管理此站点上不同路径的用户/用户组的访问权限." "Select the permission for the selected user(s)/group(s)","为已选择的用户/(用户组)选择权限" -"No permission","无权限" -"The user(s)/group(s) has no rights.","用户/用户组无权限." +"No-Access","无访问权限" +"The user(s)/group(s) has no rights.","用户/用户组无访问权限." "Read only","只读" -"The user(s)/group(s) can see all files.","用户/组 可查看所有文件." +"The user(s)/group(s) can see all files.","用户/用户组只能读取文件." "Read & Write","读写" -"The user(s)/group(s) can see, create, modify and delete all files.","用户/组 可增删改所有文件." -"Select the Access-Path for which the user(s)/group(s) should get rights","选择用户/组应该获得权限的访问路径." +"The user(s)/group(s) can see, create, modify and delete all files.","用户/用户组可读写文件." +"Select the Access-Path for which the user(s)/group(s) should get rights","选择用户/用户组应该获得权限的访问路径." diff --git a/translations/zh_CN/repositorycreate.txt b/translations/zh_CN/repositorycreate.txt index f6fa43e..6da2335 100644 --- a/translations/zh_CN/repositorycreate.txt +++ b/translations/zh_CN/repositorycreate.txt @@ -1,11 +1,20 @@ -"Create repository","创建代码仓库" -"Create a new repository to manage your sources.","创建代码仓库来管理您的资源." -"New repository data","新代码仓库数据" -"Repository name","代码仓库名字" -"Type","类型" -"File System (Recommended)","文件系统(推荐)" +"Create repository","创建仓库" +"Create a new repository to manage your sources.","创建新的仓库." +"New repository data","新仓库数据" +"Repository name","仓库名称" +"Type of repository","仓库类型" +"Pre-defined repository structure","预定义仓库结构" +"No pre-defined structure","无" +"Multi project structure","多个项目的仓库" +"Single project structure","单个项目的仓库" +"FSFS (default)","FSFS(默认)" "Berkly DB","Berkly DB" -"Valid signs for repository name are","合法的代码仓库名字为" +"Valid signs for repository name are","合法的仓库名字为" "Underscore","下划线" "Hyphen","连字符" -"No space!","切忌空格!" +"No space!","请勿使用空格!" +"Back to overview","回到起始页" +"Repository location","仓库位置" +"Project name","项目名称" +"The folders 'trunk', 'branches' and 'tags' will be created in a subfolder, which is named by the project's name.","系统将在仓库的根目录下创建项目目录，然后在项目目录下创建 "trunk", "branches" 和 "tags" 这三个子目录" +"Creates the folders 'trunk', 'branches' and 'tags' in the root of the repository.","系统将在仓库的根目录下创建 "trunk", "branches" 和 "tags" 这三个子目录" \ No newline at end of file diff --git a/translations/zh_CN/repositorylist.txt b/translations/zh_CN/repositorylist.txt index 8f9a365..94089fd 100644 --- a/translations/zh_CN/repositorylist.txt +++ b/translations/zh_CN/repositorylist.txt @@ -1,2 +1,5 @@ -"On this page you can view your existing repositories and create or delete an repository.","在本页面，您可以查看存在的代码仓库，也可以添加删除代码仓库" -"Repository management","代码仓库管理" +"On this page you can view your existing repositories and create or delete an repository.","在本页面，您可以查看、添加或删除仓库" +"Repository management","仓库管理" +"Remove configured Access-Paths","删除对应的访问路径" +"Add access path","添加访问路径" +"Repositories","仓库" diff --git a/translations/zh_CN/repositoryview.txt b/translations/zh_CN/repositoryview.txt index 05c9177..0f505ab 100644 --- a/translations/zh_CN/repositoryview.txt +++ b/translations/zh_CN/repositoryview.txt @@ -1,2 +1,5 @@ -"Repository browsing","代码仓库浏览" +"Repository browsing","浏览仓库" "Add access path","添加访问路径" +"File name","文件名" +"Author","作者" +"Revision","修订" diff --git a/translations/zh_CN/roles.txt b/translations/zh_CN/roles.txt index 01c3c89..4fc7615 100644 --- a/translations/zh_CN/roles.txt +++ b/translations/zh_CN/roles.txt @@ -8,20 +8,22 @@ "User","用户" "Can login and change the own password.","可登录并修改自己的密码." -"User-Group-Manager","用户－组－管理员" -"Create/Delete users and groups and manages memberships and change passwords of users.","可 增加－删除用户／组 ，和管理其间关系，可为用户修改密码" +"User-Group-Manager","用户、用户组管理员" +"Create/Delete users and groups and manages memberships and change passwords of users.","可增加、删除用户或用户组 ，配置用户与用户组关系，可修改所有用户的密码" "Access-Path-Manager","访问路径管理员" -"Create/Delete Access-Paths and manages user and group permissions.","可 增加－删除 访问路径，和管理用户和组之间的关系." +"Create/Delete Access-Paths and manages user and group permissions.","可增加、删除访问路径，和管理用户与用户组之间的关系." -"Repository-Creator","代码仓库创建者" -"Can create new repositories, but NOT delete.","可创建新代码仓库，但不能删除." +"Repository-Creator","仓库创建员" +"Can create new repositories, but NOT delete.","可创建新仓库，但不能删除仓库。" -"Repository-Manager","代码仓库管理员" -"Create/Delete repositories.","增加－删除 代码仓库." +"Repository-Manager","仓库管理员" +"Create/Delete repositories.","增加、删除仓库." "Role-Manager","角色管理员" "Assign and unassign web application roles to users.","为用户分配和解除网页程序的角色." "Update-Manager","更新管理员" "Can synchronize the user data from provider with the SVNAuthFile.","可以从数据提供方同步用户数据." + +"Available roles","可用的角色" \ No newline at end of file diff --git a/translations/zh_CN/settings.txt b/translations/zh_CN/settings.txt index c4ec984..e62d76b 100644 --- a/translations/zh_CN/settings.txt +++ b/translations/zh_CN/settings.txt @@ -1,21 +1,21 @@ # All -"Example","样例" +"Example","示例" # Settings table -"Subversion authorization","Subversion 授权相关" +"Subversion authorization","Subversion 授权" "Subversion authorization file","Subversion 授权文件" -"Data providers","数据提供方相关" +"Data providers","数据提供者" "User authentication","用户身份验证" "User authentication file (SVNUserFile)","用户身份验证文件 (SVNUserFile)" -"Subversion settings","Subversion 设置相关" -"Parent directory of the repositories (SVNParentPath)","代码仓库的父目录 (SVNParentPath)" +"Subversion settings","Subversion 设置" +"Parent directory of the repositories (SVNParentPath)","仓库的父目录 (SVNParentPath)" "Subversion client executable","'svn.exe' 或 'svn'可执行文件：" "Subversion admin executable","'svnadmin.exe' 或 'svnadmin' 可执行文件：" -"LDAP connection information","LDAP 连接信息相关" +"LDAP connection information","LDAP 连接信息" "Host address","LDAP主机地址 " "Protocol version","LDAP 协议版本" -"LDAP user provider information","LDAP 用户信息相关 " -"LDAP group provider information","LDAP 用户组信息相关" +"LDAP user provider information","LDAP 用户信息 " +"LDAP group provider information","LDAP 用户组信息" # No users, no edit provider "You have not defined an "UserEditProviderType", but the system also could not find any user from the configured user view provider.","您并未定义 "UserEditProviderType" . 且系统未从用户数据提供方 发现任何用户 ." @@ -27,3 +27,15 @@ "You can login now."," 登录." "No administrator defined! Select the user for the administator privileges, please.","并无权限！请配置用户的admin权限" "Save","保存" +"Test","测试" +"Test passed.","测试通过." +"The folder does not exist.","目录不存在" +"The file does not exist.","文件不存在" +"User view provider type:","用户视图提供类型:" +"User edit provider type:","用户编辑提供类型:" +"Group view provider type:","用户组视图提供类型:" +"Group edit provider type:","用户组编辑提供类型:" +"Repository view provider type:","仓库视图提供类型:" +"Repository edit provider type:","仓库编辑提供类型:" +"Save configuration","保存配置" +"Done.","保存配置完成。" diff --git a/translations/zh_CN/userchangepass.txt b/translations/zh_CN/userchangepass.txt index b197472..cdc8e44 100644 --- a/translations/zh_CN/userchangepass.txt +++ b/translations/zh_CN/userchangepass.txt @@ -1,5 +1,5 @@ "Change password of user","修改密码" "Change the password of your subversion account.","修改svn帐户密码." "New password","新密码" -"Re-type password","新密码确认" +"Re-type password","再次输入新密码" "The password's doesn't match each other.","两次新密码不匹配." diff --git a/translations/zh_CN/usercreate.txt b/translations/zh_CN/usercreate.txt index 7f3fb68..c881c07 100644 --- a/translations/zh_CN/usercreate.txt +++ b/translations/zh_CN/usercreate.txt @@ -1,6 +1,7 @@ "Create user","创建用户" -"Create a new user to grant access to the repositories.","创建一个可以授权访问对应代码仓库的新用户." +"Create a new user to grant access to the repositories.","创建一个可以授权访问对应仓库的新用户." "New user data","新用户数据" "Username","用户名" "Password","密码" "Re-type password","确认密码" +"Back to overview","回到起始页" diff --git a/translations/zh_CN/userview.txt b/translations/zh_CN/userview.txt index 6ff6e34..b52ec10 100644 --- a/translations/zh_CN/userview.txt +++ b/translations/zh_CN/userview.txt @@ -1,6 +1,6 @@ -"On this page you can see all assignments of the user.","在本页，您可以看到所有用户的分配情况." +"On this page you can see all assignments of the user.","在本页，您可以查看用户的权限和所属用户组." "Groups of user","用户组" "Permissions of users","用户权限" -"Inherit from Group","从组继承" -"Note: You can not unassign permissions from user, which are inherited by a group.","注意: 您无法解除从组继承过来的用户的权限." -"User is project manager of:","用户是项目经理:" +"Inherit from Group","权限继承自用户组" +"Note: You can not unassign permissions from user, which are inherited by a group.","注意: 用户从用户组继承的权限无法解除。" +"User is project manager of:","此用户是项目经理:" From e78db084150365ed2147aaf31357603c55f4bba7 Mon Sep 17 00:00:00 2001 From: zhoujie Date: Tue, 14 Feb 2017 17:11:51 +0800 Subject: [PATCH 2/2] fix: error when assign/unassign user to group. --- userview.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userview.php b/userview.php index 1739637..2bf50c4 100644 --- a/userview.php +++ b/userview.php @@ -29,7 +29,7 @@ // Action handling. if (check_request_var('unassign')) { - $appEngine->handleAction('unassign_usergroup'); + $appEngine->handleAction('unassign_fromgroup'); } else if (check_request_var('unassign_permission')) { @@ -49,7 +49,7 @@ } else if(check_request_var('assign_usergroup')) { - $appEngine->handleAction('assign_usertogroup'); + $appEngine->handleAction('assign_togroup'); } // Get required variables.