From 5be2d394c28f12269ba1aa8e2bd4f9cbd5db9540 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 20 Oct 2014 16:55:39 -0400
Subject: [PATCH] Merge release-1.6.1

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

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index c80d45c..2760f85 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -561,6 +561,7 @@
 gb.enhancementTickets = enhancements
 gb.taskTickets = tasks
 gb.questionTickets = questions
+gb.maintenanceTickets = maintenance
 gb.requestTickets = enhancements & tasks
 gb.yourCreatedTickets = created by you
 gb.yourWatchedTickets = watched by you
@@ -739,4 +740,6 @@
 gb.comment = Comment
 gb.sshKeyCommentDescription = Enter an optional comment. If blank, the comment will be extracted from the key data.
 gb.permission = Permission
-gb.sshKeyPermissionDescription = Specify the access permission for the SSH key
\ No newline at end of file
+gb.sshKeyPermissionDescription = Specify the access permission for the SSH key
+gb.transportPreference = Transport Preference
+gb.transportPreferenceDescription = Set the transport that you prefer to use for cloning
\ No newline at end of file

--
Gitblit v1.9.1