Improve Chinese translation of "fork"

The currently used translation of "fork" is ambiguous, using the same
word as for "branch".

Fixes #1448

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
index 67c103c81613cf050e1849104df4ed484ac0e30a..2cec64719b0c6ac369667b72c7c76e3df636094c 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
@@ -319,25 +319,25 @@ gb.projects = \u9879\u76ee
 gb.project = \u9879\u76ee
 gb.allProjects = \u6240\u6709\u9879\u76ee
 gb.copyToClipboard = \u590d\u5236\u5230\u526a\u8d34\u677f
-gb.fork = \u5efa\u7acb\u5206\u652f
-gb.forks = \u5206\u652f
-gb.forkRepository = \u5efa\u7acb {0} \u7684\u5206\u652f\uff1f
-gb.repositoryForked = {0} \u5df2\u5efa\u7acb\u5206\u652f
-gb.repositoryForkFailed = \u5efa\u7acb\u5206\u652f\u5931\u8d25
+gb.fork = \u5efa\u7acb\u590d\u523b
+gb.forks = \u590d\u523b
+gb.forkRepository = \u5efa\u7acb {0} \u7684\u590d\u523b\uff1f
+gb.repositoryForked = {0} \u5df2\u5efa\u7acb\u590d\u523b
+gb.repositoryForkFailed = \u5efa\u7acb\u590d\u523b\u5931\u8d25
 gb.personalRepositories = \u79c1\u6709\u7248\u672c\u5e93
-gb.allowForks = \u5141\u8bb8\u5efa\u7acb\u5206\u652f
-gb.allowForksDescription = \u5141\u8bb8\u6388\u6743\u7684\u7528\u6237\u5efa\u7acb\u6b64\u7248\u672c\u5e93\u7684\u5206\u652f
-gb.forkedFrom = \u5206\u652f\u81ea
-gb.canFork = \u5141\u8bb8\u5206\u652f
-gb.canForkDescription = \u5141\u8bb8\u5206\u652f\u7248\u672c\u5e93\u5e76\u590d\u5236\u5230\u79c1\u6709\u7248\u672c\u5e93\u4e2d
-gb.myFork = \u67e5\u770b\u6211\u7684\u5206\u652f
-gb.forksProhibited = \u7981\u6b62\u5efa\u7acb\u5206\u652f
-gb.forksProhibitedWarning = \u5f53\u524d\u7248\u672c\u5e93\u7981\u6b62\u5efa\u7acb\u5206\u652f
-gb.noForks = {0} \u6ca1\u6709\u5206\u652f
-gb.forkNotAuthorized = \u62b1\u6b49\uff0c\u60a8\u65e0\u6743\u5206\u652f {0}
+gb.allowForks = \u5141\u8bb8\u5efa\u7acb\u590d\u523b
+gb.allowForksDescription = \u5141\u8bb8\u6388\u6743\u7684\u7528\u6237\u5efa\u7acb\u6b64\u7248\u672c\u5e93\u7684\u590d\u523b
+gb.forkedFrom = \u590d\u523b\u81ea
+gb.canFork = \u5141\u8bb8\u590d\u523b
+gb.canForkDescription = \u5141\u8bb8\u590d\u523b\u7248\u672c\u5e93\u5e76\u590d\u5236\u5230\u79c1\u6709\u7248\u672c\u5e93\u4e2d
+gb.myFork = \u67e5\u770b\u6211\u7684\u590d\u523b
+gb.forksProhibited = \u7981\u6b62\u5efa\u7acb\u590d\u523b
+gb.forksProhibitedWarning = \u5f53\u524d\u7248\u672c\u5e93\u7981\u6b62\u5efa\u7acb\u590d\u523b
+gb.noForks = {0} \u6ca1\u6709\u590d\u523b
+gb.forkNotAuthorized = \u62b1\u6b49\uff0c\u60a8\u65e0\u6743\u590d\u523b {0}
 gb.forkInProgress = \u6b63\u5728\u590d\u5236
-gb.preparingFork = \u6b63\u5728\u4e3a\u60a8\u51c6\u5907\u5206\u652f...
-gb.isFork = \u5df2\u5efa\u7acb\u5206\u652f
+gb.preparingFork = \u6b63\u5728\u4e3a\u60a8\u51c6\u5907\u590d\u523b...
+gb.isFork = \u5df2\u5efa\u7acb\u590d\u523b
 gb.canCreate = \u5141\u8bb8\u521b\u5efa
 gb.canCreateDescription = \u5141\u8bb8\u521b\u5efa\u79c1\u6709\u7248\u672c\u5e93
 gb.illegalPersonalRepositoryLocation = \u60a8\u7684\u79c1\u6709\u7248\u672c\u5e93\u5fc5\u987b\u4f4d\u4e8e \"{0}\"