From b94965e87929c6b4e42f9a2078dc0d910cc2637d Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 09 May 2012 07:59:00 -0400 Subject: [PATCH] Merge pull request #17 from peterloron/master --- src/com/gitblit/wicket/GitBlitWebApp.properties | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index e73addc..57ccd68 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -270,4 +270,8 @@ gb.noFederation = Sorry, {0} is not configured to federate with any Gitblit instances. gb.proposalFailed = Sorry, {0} did not receive any proposal data! gb.proposalError = Sorry, {0} reports that an unexpected error occurred! -gb.failedToSendProposal = Failed to send proposal! \ No newline at end of file +gb.failedToSendProposal = Failed to send proposal! +gb.userServiceDoesNotPermitAddUser = {0} does not permit adding a user account! +gb.userServiceDoesNotPermitPasswordChanges = {0} does not permit password changes! +gb.displayName = display name +gb.emailAddress = email address \ No newline at end of file -- Gitblit v1.9.1