From 93f0b1a11d5a7f7c44cfcb8ff5300bb68b8b8188 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 01 Oct 2011 17:30:48 -0400
Subject: [PATCH] Refactored federation servlet and utils. Started rpc servlet and utils.

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

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index ab7ef4b..f279612 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -108,9 +108,9 @@
 gb.excludeFromFederation = exclude from federation
 gb.excludeFromFederationDescription = block federated Gitblit instances from pulling this object
 gb.tokens = federation tokens
-gb.tokenAllDescription = federate repositories, users, & settings
-gb.tokenUnrDescription = federate repositories & users
-gb.tokenJurDescription = federate repositories
+gb.tokenAllDescription = all repositories, users, & settings
+gb.tokenUnrDescription = all repositories & users
+gb.tokenJurDescription = all repositories
 gb.federatedRepositoryDefinitions = repository definitions
 gb.federatedUserDefinitions = user definitions
 gb.federatedSettingDefinitions = setting definitions
@@ -128,9 +128,14 @@
 gb.exclusions = exclusions
 gb.registration = registration
 gb.registrations = federation registrations
-gb.sendProposal send proposal
+gb.sendProposal propose
 gb.status = status
 gb.origin = origin
 gb.federationStrategy = federation strategy
 gb.federationRegistration = federation registration
 gb.federationResults = federation pull results
+gb.federationSets = federation sets
+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

--
Gitblit v1.9.1