From 15640f86032169ad9bfef17c387b94f30a61582f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Thu, 11 Oct 2012 18:11:50 -0400 Subject: [PATCH] Experimental committer verification --- src/com/gitblit/wicket/GitBlitWebApp.properties | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index d30f571..e786d31 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -84,6 +84,7 @@ gb.cloneRestricted = authenticated clone & push gb.viewRestricted = authenticated view, clone, & push gb.useTicketsDescription = distributed Ticgit issues +gb.useTicketsDescription = readonly, distributed Ticgit issues gb.useDocsDescription = enumerates Markdown documentation in repository gb.showRemoteBranchesDescription = show remote branches gb.canAdminDescription = can administer Gitblit server @@ -323,14 +324,23 @@ gb.forks = forks gb.forkRepository = fork {0}? gb.repositoryForked = {0} has been forked -gb.repositoryForkFailed= failed to fork {1} +gb.repositoryForkFailed= fork has failed gb.personalRepositories = personal repositories gb.allowForks = allow forks gb.allowForksDescription = allow authorized users to fork this repository gb.forkedFrom = forked from gb.canFork = can fork -gb.canForkDescription = user is permitted to fork authorized repositories +gb.canForkDescription = can fork authorized repositories to personal repositories gb.myFork = view my fork gb.forksProhibited = forks prohibited gb.forksProhibitedWarning = this repository forbids forks -gb.noForks = {0} has no forks \ No newline at end of file +gb.noForks = {0} has no forks +gb.forkNotAuthorized = sorry, you are not authorized to fork {0} +gb.forkInProgress = fork in progress +gb.preparingFork = preparing your fork... +gb.isFork = is fork +gb.canCreate = can create +gb.canCreateDescription = can create personal repositories +gb.illegalPersonalRepositoryLocation = your personal repository must be located at \"{0}\" +gb.verifyCommitter = verify committer +gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account (all merges require "--no-ff" to enforce committer identity) \ No newline at end of file -- Gitblit v1.9.1