diff options
| author | James Moger <james.moger@gitblit.com> | 2014-03-09 10:05:52 -0400 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2014-03-09 10:05:52 -0400 |
| commit | acca1104f289d4eeed3148d7e6ee57562b292889 (patch) | |
| tree | e1a0c24cc2a57fbb715281bdab1d17b1d57b08bd | |
| parent | 08bca7b42fc0435797c01eded969472ce9c60340 (diff) | |
| parent | 2c84a191eb53b27d3a16062749e2f18505f27494 (diff) | |
| download | gitblit-acca1104f289d4eeed3148d7e6ee57562b292889.tar.gz gitblit-acca1104f289d4eeed3148d7e6ee57562b292889.zip | |
Merge pull request #158 from yin8086/ChineseTrans
add a Chinese translate string
| -rw-r--r-- | src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties | 3 |
1 files changed, 2 insertions, 1 deletions
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 1ee3f702..5976614b 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties @@ -668,4 +668,5 @@ gb.repositoryIsMirror = \u5f53\u524d\u7248\u672c\u5e93\u662f\u53ea\u8bfb\u955c\u gb.repositoryIsFrozen = \u5f53\u524d\u7248\u672c\u5e93\u5df2\u88ab\u51bb\u7ed3\u3002 gb.repositoryDoesNotAcceptPatchsets = \u5f53\u524d\u7248\u672c\u5e93\u4e0d\u5141\u8bb8\u8865\u4e01\u96c6\u3002 gb.serverDoesNotAcceptPatchsets = \u5f53\u524d\u670d\u52a1\u5668\u4e0d\u5141\u8bb8\u8865\u4e01\u96c6\u3002 -gb.ticketIsClosed = \u5f53\u524d\u5de5\u5355\u5df2\u5173\u95ed\u3002
\ No newline at end of file +gb.ticketIsClosed = \u5f53\u524d\u5de5\u5355\u5df2\u5173\u95ed\u3002 +gb.mergeToDescription = \u5408\u5e76\u5de5\u5355\u8865\u4e01\u96c6\u7684\u9ed8\u8ba4\u96c6\u6210\u5206\u652f
\ No newline at end of file |