From e0af48ea57e60a88cf5be3b2d52223cba5bbf277 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Wed, 03 Oct 2012 17:07:22 -0400 Subject: [PATCH] Fix fork detection on Windows --- src/com/gitblit/wicket/GitBlitWebApp.properties | 121 +++++++++++++++++++++++++++++++++++++++- 1 files changed, 118 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 2806eee..0478448 100644 --- a/src/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/com/gitblit/wicket/GitBlitWebApp.properties @@ -78,7 +78,7 @@ 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 @@ -128,9 +128,10 @@ 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) gb.headRefDescription = change the ref that HEAD links to. e.g. refs/heads/master gb.federationStrategy = federation strategy gb.federationRegistration = federation registration @@ -201,6 +202,8 @@ gb.preReceiveScripts = pre-receive scripts gb.postReceiveScripts = post-receive scripts gb.hookScripts = hook scripts +gb.customFields = custom fields +gb.customFieldsDescription = custom fields available to Groovy hooks gb.accessPermissions = access permissions gb.filters = filters gb.generalDescription = common settings @@ -215,10 +218,122 @@ gb.workingCopyWarning = this repository has a working copy and can not receive pushes gb.query = query gb.queryHelp = Standard query syntax is supported.<p/><p/>Please see <a target="_new" href="http://lucene.apache.org/core/old_versioned_docs/versions/3_5_0/queryparsersyntax.html">Lucene Query Parser Syntax</a> for details. +gb.queryResults = results {0} - {1} ({2} hits) +gb.noHits = no hits gb.authored = authored gb.committed = committed gb.indexedBranches = indexed branches gb.indexedBranchesDescription = select the branches to include in your Lucene index gb.noIndexedRepositoriesWarning = none of your repositories are configured for Lucene indexing gb.undefinedQueryWarning = query is undefined! -gb.noSelectedRepositoriesWarning = please select one or more repositories! \ No newline at end of file +gb.noSelectedRepositoriesWarning = please select one or more repositories! +gb.luceneDisabled = Lucene indexing is disabled +gb.failedtoRead = Failed to read +gb.isNotValidFile = is not a valid file +gb.failedToReadMessage = Failed to read default message from {0}! +gb.passwordsDoNotMatch = Passwords do not match! +gb.passwordTooShort = Password is too short. Minimum length is {0} characters. +gb.passwordChanged = Password successfully changed. +gb.passwordChangeAborted = Password change aborted. +gb.pleaseSetRepositoryName = Please set repository name! +gb.illegalLeadingSlash = Leading root folder references (/) are prohibited. +gb.illegalRelativeSlash = Relative folder references (../) are prohibited. +gb.illegalCharacterRepositoryName = Illegal character ''{0}'' in repository name! +gb.selectAccessRestriction = Please select access restriction! +gb.selectFederationStrategy = Please select federation strategy! +gb.pleaseSetTeamName = Please enter a teamname! +gb.teamNameUnavailable = Team name ''{0}'' is unavailable. +gb.teamMustSpecifyRepository = A team must specify at least one repository. +gb.teamCreated = New team ''{0}'' successfully created. +gb.pleaseSetUsername = Please enter a username! +gb.usernameUnavailable = Username ''{0}'' is unavailable. +gb.combinedMd5Rename = Gitblit is configured for combined-md5 password hashing. You must enter a new password on account rename. +gb.userCreated = New user ''{0}'' successfully created. +gb.couldNotFindFederationRegistration = Could not find federation registration! +gb.failedToFindGravatarProfile = Failed to find Gravatar profile for {0} +gb.branchStats = {0} commits and {1} tags in {2} +gb.repositoryNotSpecified = Repository not specified! +gb.repositoryNotSpecifiedFor = Repository not specified for {0}! +gb.canNotLoadRepository = Can not load repository +gb.commitIsNull = Commit is null +gb.unauthorizedAccessForRepository = Unauthorized access for repository +gb.failedToFindCommit = Failed to find commit \"{0}\" in {1} for {2} page! +gb.couldNotFindFederationProposal = Could not find federation proposal! +gb.invalidUsernameOrPassword = Invalid username or password! +gb.OneProposalToReview = There is 1 federation proposal awaiting review. +gb.nFederationProposalsToReview = There are {0} federation proposals awaiting review. +gb.couldNotFindTag = Could not find tag {0} +gb.couldNotCreateFederationProposal = Could not create federation proposal! +gb.pleaseSetGitblitUrl = Please enter your Gitblit url! +gb.pleaseSetDestinationUrl = Please enter a destination url for your proposal! +gb.proposalReceived = Proposal successfully received by {0}. +gb.noGitblitFound = Sorry, {0} could not find a Gitblit instance at {1}. +gb.noProposals = Sorry, {0} is not accepting proposals at this time. +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! +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 +gb.errorAdminLoginRequired = Administration requires a login +gb.errorOnlyAdminMayCreateRepository = Only an administrator may create a repository +gb.errorOnlyAdminOrOwnerMayEditRepository = Only an administrator or the owner may edit a repository +gb.errorAdministrationDisabled = Administration is disabled +gb.lastNDays = last {0} days +gb.completeGravatarProfile = Complete profile on Gravatar.com +gb.none = none +gb.line = line +gb.content = content +gb.empty = empty +gb.inherited = inherited +gb.deleteRepository = Delete repository \"{0}\"? +gb.repositoryDeleted = Repository ''{0}'' deleted. +gb.repositoryDeleteFailed = Failed to delete repository ''{0}''! +gb.deleteUser = Delete user \"{0}\"? +gb.userDeleted = User ''{0}'' deleted. +gb.userDeleteFailed = Failed to delete user ''{0}''! +gb.time.justNow = just now +gb.time.today = today +gb.time.yesterday = yesterday +gb.time.minsAgo = {0} mins ago +gb.time.hoursAgo = {0} hours ago +gb.time.daysAgo = {0} days ago +gb.time.weeksAgo = {0} weeks ago +gb.time.monthsAgo = {0} months ago +gb.time.oneYearAgo = 1 year ago +gb.time.yearsAgo = {0} years ago +gb.duration.oneDay = 1 day +gb.duration.days = {0} days +gb.duration.oneMonth = 1 month +gb.duration.months = {0} months +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.markdownFailure = Failed to parse Markdown content! +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 = user is permitted to fork authorized 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... \ No newline at end of file -- Gitblit v1.9.1