From f09f249c0eacbc73592c4f656a9c34f6bc1df1cc Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 23 Nov 2012 10:52:43 -0500 Subject: [PATCH] Added JCalendar 1.3.2 dependency --- src/com/gitblit/wicket/GitBlitWebApp.properties | 43 ++++++++++++++++++++++++++++++++++++++----- 1 files changed, 38 insertions(+), 5 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 97faf76..22ae92f 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -83,7 +83,7 @@ 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 @@ -311,8 +311,8 @@ 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 gb.projects = projects @@ -329,7 +329,7 @@ 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 @@ -340,4 +340,37 @@ gb.isFork = is fork gb.canCreate = can create gb.canCreateDescription = can create personal repositories -gb.illegalPersonalRepositoryLocation = your personal repository must be located at \"{0}\" \ No newline at end of file +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 THIS 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 regular expression \"{0}\" +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 +gb.administrator = admin +gb.administratorPermission = Gitblit administrator +gb.team = team +gb.teamPermission = permission set by \"{0}\" team membership +gb.missing = missing! +gb.missingPermission = the repository for this permission is missing! +gb.mutable = mutable +gb.specified = specified +gb.effective = effective -- Gitblit v1.9.1