From 8c92559a483cf0b01b33d926421ec17605b5ff75 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 03 May 2013 19:27:25 -0400
Subject: [PATCH] Partially merged url panel with optional support for app clone urls

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp.properties |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 81eecb2..4752e99 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -73,7 +73,6 @@
 gb.name = name
 gb.enableTickets = enable tickets
 gb.enableDocs = enable docs
-gb.enableIncrementalRevisionNumbers = enable incremental revision numbers
 gb.save = save
 gb.showRemoteBranches = show remote branches
 gb.editUsers = edit users
@@ -86,7 +85,6 @@
 gb.viewRestricted = authenticated view, clone, & push
 gb.useTicketsDescription = readonly, distributed Ticgit issues
 gb.useDocsDescription = enumerates Markdown documentation in repository
-gb.useIncrementalRevisionNumbersDescription = automatic tagging of each push with an incremental revision number
 gb.showRemoteBranchesDescription = show remote branches
 gb.canAdminDescription = can administer Gitblit server
 gb.permittedUsers = permitted users
@@ -448,3 +446,13 @@
 gb.sessionEnded = Session has been closed
 gb.closeBrowser = Please close the browser to properly end the session.
 gb.doesNotExistInTree = {0} does not exist in tree {1}
+gb.enableIncrementalPushTags = enable incremental push tags
+gb.useIncrementalPushTagsDescription = on push, automatically tag each branch tip with an incremental revision number
+gb.incrementalPushTagMessage = Auto-tagged [{0}] branch on push
+gb.externalPermissions = {0} access permissions for {1} are externally maintained
+gb.viewAccess = You do not have Gitblit read or write access
+gb.yourProtocolPermissionIs = Your {0} access permission for {1} is {2}
+gb.cloneWithSparkleShare = clone with SparkleShare\u2122
+gb.cloneWithSourceTree = clone with SourceTree\u2122
+gb.cloneWithGitHub = clone with GitHub\u2122 for {0}
+gb.cloneWithSmartGit = clone with SmartGit\u2122
\ No newline at end of file

--
Gitblit v1.9.1