From cc5ad8d53bcf953eb60e11dcf72aa9f69ec043f3 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 06 Oct 2011 21:03:52 -0400
Subject: [PATCH] Merge branch 'master' into rpc

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

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index f279612..2aa5107 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -66,7 +66,7 @@
 gb.missingUsername = Missing Username
 gb.edit = edit
 gb.searchTypeTooltip = Select Search Type
-gb.searchTooltip = Search Gitblit
+gb.searchTooltip = Search {0}
 gb.delete = delete
 gb.docs = docs
 gb.accessRestriction = access restriction
@@ -138,4 +138,6 @@
 gb.message = message
 gb.myUrlDescription = the publicly accessible url for your Gitblit instance
 gb.destinationUrl = send to
-gb.destinationUrlDescription = the url of the Gitblit instance to send your proposal
\ No newline at end of file
+gb.destinationUrlDescription = the url of the Gitblit instance to send your proposal
+gb.users = users
+gb.federation = federation
\ No newline at end of file

--
Gitblit v1.9.1