From abcb146f0c4e5c99e5e44349a65e6fd49e9296d9 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Tue, 30 Oct 2012 17:03:02 -0400 Subject: [PATCH] Moved owner field onto access permissions tab --- src/com/gitblit/wicket/GitBlitWebApp.properties | 62 ++++++++++++++++++++++++++++--- 1 files changed, 56 insertions(+), 6 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 2a31f8b..c6ceb9f 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -78,12 +78,12 @@ gb.editUsers = edit users gb.confirmPassword = confirm password gb.restrictedRepositories = restricted repositories -gb.canAdmin can admin +gb.canAdmin = can admin gb.notRestricted = anonymous view, clone, & push gb.pushRestricted = authenticated push 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 @@ -128,7 +128,7 @@ gb.exclusions = exclusions gb.registration = registration gb.registrations = federation registrations -gb.sendProposal propose +gb.sendProposal = propose gb.status = status gb.origin = origin gb.headRef = default branch (HEAD) @@ -311,7 +311,57 @@ gb.duration.oneYear = 1 year gb.duration.years = {0} years gb.authorizationControl = authorization control -gb.allowAuthenticatedDescription = grant restricted access to all authenticated users -gb.allowNamedDescription = grant restricted access to named users or teams +gb.allowAuthenticatedDescription = grant RW+ permission to all authenticated users +gb.allowNamedDescription = grant fine-grained permissions to named users or teams gb.markdownFailure = Failed to parse Markdown content! -gb.clearCache = clear cache \ No newline at end of file +gb.clearCache = clear cache +gb.projects = projects +gb.project = project +gb.allProjects = all projects +gb.copyToClipboard = copy to clipboard +gb.fork = fork +gb.forks = forks +gb.forkRepository = fork {0}? +gb.repositoryForked = {0} has been forked +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 = 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 +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 +gb.verifyCommitterNote = all merges require "--no-ff" to enforce committer identity +gb.repositoryPermissions = repository permissions +gb.userPermissions = user permissions +gb.teamPermissions = team permissions +gb.add = add +gb.noPermission = DELETE PERMISSION +gb.excludePermission = {0} (exclude) +gb.viewPermission = {0} (view) +gb.clonePermission = {0} (clone) +gb.pushPermission = {0} (push) +gb.createPermission = {0} (push, ref creation) +gb.deletePermission = {0} (push, ref creation+deletion) +gb.rewindPermission = {0} (push, ref creation+deletion+rewind) +gb.permission = permission +gb.regexPermission = this permission is set from a regular expression +gb.accessDenied = access denied +gb.busyCollectingGarbage = sorry, Gitblit is busy collecting garbage in {0} +gb.gcPeriod = GC period +gb.gcPeriodDescription = duration between garbage collections +gb.gcThreshold = GC threshold +gb.gcThresholdDescription = minimum total size of loose objects to trigger early garbage collection +gb.ownerPermission = repository owner \ No newline at end of file -- Gitblit v1.9.1