From 92a33bc2ef40a7252ca8800cc48657afe66db2ef Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 01 May 2014 16:14:15 -0400
Subject: [PATCH] Revert "Implementation of the getTickets capability of recovering all tickets from a nullable RepositoryModel"
---
src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties | 25 ++++++++++++++++---------
1 files changed, 16 insertions(+), 9 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 7e19b18..5976614 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
@@ -55,7 +55,7 @@
gb.modification = \u4fee\u6539
gb.deletion = \u5220\u9664
gb.rename = \u91cd\u547d\u540d
-gb.metrics = \u6d3b\u52a8\u56fe\u6807
+gb.metrics = \u7edf\u8ba1\u56fe\u8868
gb.stats = \u7edf\u8ba1
gb.markdown = markdown
gb.changedFiles = \u5df2\u4fee\u6539\u6587\u4ef6
@@ -470,9 +470,9 @@
gb.oneCommitTo = 1 \u6b21\u63a8\u9001\u81f3
gb.byNAuthors = \u6765\u81ea {0}
gb.byOneAuthor = \u6765\u81ea {0}
-gb.viewComparison = \u5bf9\u6bd4\u4ee5\u4e0a {0} \u6b21\u63d0\u4ea4\u5185\u5bb9 \\u00bb
-gb.nMoreCommits = \u5176\u4ed6 {0} \u6b21\u63d0\u4ea4 \\u00bb
-gb.oneMoreCommit = \u5176\u4ed6 1 \u6b21\u63d0\u4ea4 \\u00bb
+gb.viewComparison = \u5bf9\u6bd4\u4ee5\u4e0a {0} \u6b21\u63d0\u4ea4\u5185\u5bb9 \u00bb
+gb.nMoreCommits = \u5176\u4ed6 {0} \u6b21\u63d0\u4ea4 \u00bb
+gb.oneMoreCommit = \u5176\u4ed6 1 \u6b21\u63d0\u4ea4 \u00bb
gb.pushedNewTag = \u63a8\u9001\u65b0\u6807\u7b7e
gb.createdNewTag = \u521b\u5efa\u65b0\u6807\u7b7e
gb.deletedTag = \u5220\u9664\u6807\u7b7e
@@ -556,7 +556,7 @@
gb.requireApproval = \u9700\u8981\u786e\u8ba4
gb.requireApprovalDescription = \u5408\u5e76\u6309\u94ae\u53ea\u6709\u5728\u8865\u4e01\u96c6\u88ab\u786e\u8ba4\u540e\u624d\u4f1a\u88ab\u6fc0\u6d3b
gb.topic = \u4e3b\u9898
-gb.proposalTickets = \u5df2\u53d1\u5e03\u4fee\u6539
+gb.proposalTickets = \u5df2\u53d1\u5e03\u5efa\u8bae
gb.bugTickets = bugs
gb.enhancementTickets = \u6539\u8fdb
gb.taskTickets = \u4efb\u52a1
@@ -607,11 +607,11 @@
gb.checkout = \u68c0\u51fa
gb.checkoutViaCommandLine = \u901a\u8fc7\u547d\u4ee4\u884c\u68c0\u51fa
gb.checkoutViaCommandLineNote = \u60a8\u53ef\u4ee5\u68c0\u51fa\u7136\u540e\u5728\u672c\u5730\u4f7f\u7528\u514b\u9686\u6d4b\u8bd5\u4fee\u6539\u7684\u5185\u5bb9\u3002
-gb.checkoutStep1 = \u83b7\u53d6\u5f53\u524d\u8865\u4e01\u96c6 \\u2014 \u7136\u540e\u5728\u60a8\u7684\u672c\u5730\u9879\u76ee\u76ee\u5f55\u8fd0\u884c
+gb.checkoutStep1 = \u83b7\u53d6\u5f53\u524d\u8865\u4e01\u96c6 \u2014 \u7136\u540e\u5728\u60a8\u7684\u672c\u5730\u9879\u76ee\u76ee\u5f55\u8fd0\u884c
gb.checkoutStep2 = \u5c06\u8865\u4e01\u96c6\u68c0\u51fa\u81f3\u65b0\u7684\u5206\u652f\u4ee5\u8fdb\u884c\u4fee\u8ba2
gb.mergingViaCommandLine = \u4f7f\u7528\u547d\u4ee4\u884c\u5408\u5e76
gb.mergingViaCommandLineNote = \u5982\u679c\u60a8\u4e0d\u60f3\u4f7f\u7528\u5408\u5e76\u6309\u94ae\uff0c\u6216\u8005\u65e0\u6cd5\u81ea\u52a8\u5408\u5e76\uff0c\u60a8\u53ef\u4ee5\u4f7f\u7528\u547d\u4ee4\u884c\u624b\u52a8\u5408\u5e76
-gb.mergeStep1 = \u68c0\u51fa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\u4ee5\u4fee\u8ba2\u6539\u52a8 \\u2014 \u7136\u540e\u5728\u60a8\u7684\u672c\u5730\u9879\u76ee\u76ee\u5f55\u8fd0\u884c
+gb.mergeStep1 = \u68c0\u51fa\u4e00\u4e2a\u65b0\u7684\u5206\u652f\u4ee5\u4fee\u8ba2\u6539\u52a8 \u2014 \u7136\u540e\u5728\u60a8\u7684\u672c\u5730\u9879\u76ee\u76ee\u5f55\u8fd0\u884c
gb.mergeStep2 = \u5f15\u5165\u5df2\u63d0\u4ea4\u4fee\u6539\u540e\u4fee\u8ba2
gb.mergeStep3 = \u5408\u5e76\u5df2\u63d0\u4ea4\u7684\u4fee\u6539\u7136\u540e\u66f4\u65b0\u670d\u52a1\u5668
gb.download = \u4e0b\u8f7d
@@ -656,10 +656,17 @@
gb.nOpenTickets = {0} \u5f00\u542f
gb.nClosedTickets = {0} \u5173\u95ed
gb.nTotalTickets = \u603b\u8ba1 {0}
-gb.body = body
+gb.body = \u5185\u5bb9
gb.mergeSha = \u5408\u5e76SHA
gb.mergeTo = \u5408\u5e76\u5230
gb.labels = \u6807\u7b7e
gb.reviewers = \u4fee\u8ba2\u4eba
gb.voters = \u6295\u7968\u4eba
-gb.mentions = \u63d0\u53ca
\ No newline at end of file
+gb.mentions = \u63d0\u53ca
+gb.canNotProposePatchset = \u65e0\u6cd5\u63d0\u4ea4\u8865\u4e01\u96c6
+gb.repositoryIsMirror = \u5f53\u524d\u7248\u672c\u5e93\u662f\u53ea\u8bfb\u955c\u50cf\u3002
+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
+gb.mergeToDescription = \u5408\u5e76\u5de5\u5355\u8865\u4e01\u96c6\u7684\u9ed8\u8ba4\u96c6\u6210\u5206\u652f
\ No newline at end of file
--
Gitblit v1.9.1