From 7a401a3ff909bf82fb4068d6dba430497f74084a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 05 May 2014 11:32:46 -0400
Subject: [PATCH] Allow plugins to extend the top navbar and repository navbar
---
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 217 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 208 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 036af26..d0c2d48 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -8,6 +8,7 @@
gb.author = author
gb.committer = committer
gb.commit = commit
+gb.age = age
gb.tree = tree
gb.parent = parent
gb.url = URL
@@ -17,7 +18,7 @@
gb.ticketId = ticket id
gb.ticketAssigned = assigned
gb.ticketOpenDate = open date
-gb.ticketState = state
+gb.ticketStatus = status
gb.ticketComments = comments
gb.view = view
gb.local = local
@@ -36,7 +37,7 @@
gb.commitdiff = commitdiff
gb.tickets = tickets
gb.pageFirst = first
-gb.pagePrevious prev
+gb.pagePrevious = prev
gb.pageNext = next
gb.head = HEAD
gb.blame = blame
@@ -57,7 +58,7 @@
gb.metrics = metrics
gb.stats = stats
gb.markdown = markdown
-gb.changedFiles = changed files
+gb.changedFiles = changed files
gb.filesAdded = {0} files added
gb.filesModified = {0} files modified
gb.filesDeleted = {0} files deleted
@@ -257,10 +258,10 @@
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.failedToFindCommit = Failed to find commit \"{0}\" in {1}!
gb.couldNotFindFederationProposal = Could not find federation proposal!
gb.invalidUsernameOrPassword = Invalid username or password!
-gb.OneProposalToReview = There is 1 federation proposal awaiting review.
+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!
@@ -342,7 +343,7 @@
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.verifyCommitterDescription = require committer identity to match pushing Gitblit user account
gb.verifyCommitterNote = all merges require "--no-ff" to enforce committer identity
gb.repositoryPermissions = repository permissions
gb.userPermissions = user permissions
@@ -439,7 +440,7 @@
gb.sslCertificateGeneratedRestart = Successfully generated new server SSL certificate for {0}.\nYou must restart Gitblit to use the new certificate.\n\nIf you are launching with the '--alias' parameter you will have to set that to ''--alias {0}''.
gb.validity = validity
gb.siteName = site name
-gb.siteNameDescription = short, descriptive name of your server
+gb.siteNameDescription = short, descriptive name of your server
gb.excludeFromActivity = exclude from activity page
gb.isSparkleshared = repository is Sparkleshared
gb.owners = owners
@@ -462,8 +463,7 @@
gb.at = at
gb.of = of
gb.in = in
-gb.morePushes = all pushes...
-gb.pushes = pushes
+gb.moreChanges = all changes...
gb.pushedNCommitsTo = pushed {0} commits to
gb.pushedOneCommitTo = pushed 1 commit to
gb.commitsTo = {0} commits to
@@ -477,7 +477,10 @@
gb.createdNewTag = created new tag
gb.deletedTag = deleted tag
gb.pushedNewBranch = pushed new branch
+gb.createdNewBranch = created new branch
gb.deletedBranch = deleted branch
+gb.createdNewPullRequest = created pull request
+gb.mergedPullRequest = merged pull request
gb.rewind = REWIND
gb.star = star
gb.unstar = unstar
@@ -485,3 +488,199 @@
gb.starredRepositories = starred repositories
gb.failedToUpdateUser = Failed to update user account!
gb.myRepositories = my repositories
+gb.noActivity = there has been no activity in the last {0} days
+gb.findSomeRepositories = find some repositories
+gb.metricAuthorExclusions = author metric exclusions
+gb.myDashboard = my dashboard
+gb.failedToFindAccount = failed to find user account ''{0}''
+gb.reflog = reflog
+gb.active = active
+gb.starred = starred
+gb.owned = owned
+gb.starredAndOwned = starred & owned
+gb.reviewPatchset = review {0} patchset {1}
+gb.todaysActivityStats = today / {1} commits by {2} authors
+gb.todaysActivityNone = today / none
+gb.noActivityToday = there has been no activity today
+gb.anonymousUser= anonymous
+gb.commitMessageRenderer = commit message renderer
+gb.diffStat = {0} insertions & {1} deletions
+gb.home = home
+gb.isMirror = this repository is a mirror
+gb.mirrorOf = mirror of {0}
+gb.mirrorWarning = this repository is a mirror and can not receive pushes
+gb.docsWelcome1 = You can use docs to document your repository.
+gb.docsWelcome2 = Commit a README.md or a HOME.md file to get started.
+gb.createReadme = create a README
+gb.responsible = responsible
+gb.createdThisTicket = created this ticket
+gb.proposedThisChange = proposed this change
+gb.uploadedPatchsetN = uploaded patchset {0}
+gb.uploadedPatchsetNRevisionN = uploaded patchset {0} revision {1}
+gb.mergedPatchset = merged patchset
+gb.commented = commented
+gb.noDescriptionGiven = no description given
+gb.toBranch = to {0}
+gb.createdBy = created by
+gb.oneParticipant = {0} participant
+gb.nParticipants = {0} participants
+gb.noComments = no comments
+gb.oneComment = {0} comment
+gb.nComments = {0} comments
+gb.oneAttachment = {0} attachment
+gb.nAttachments = {0} attachments
+gb.milestone = milestone
+gb.compareToMergeBase = compare to merge base
+gb.compareToN = compare to {0}
+gb.open = open
+gb.closed = closed
+gb.merged = merged
+gb.ticketPatchset = ticket {0}, patchset {1}
+gb.patchsetMergeable = This patchset can be automatically merged into {0}.
+gb.patchsetMergeableMore = This patchset may also be merged into {0} from the command line.
+gb.patchsetAlreadyMerged = This patchset has been merged into {0}.
+gb.patchsetNotMergeable = This patchset can not be automatically merged into {0}.
+gb.patchsetNotMergeableMore = This patchset must be rebased or manually merged into {0} to resolve conflicts.
+gb.patchsetNotApproved = This patchset revision has not been approved for merging into {0}.
+gb.patchsetNotApprovedMore = A reviewer must approve this patchset.
+gb.patchsetVetoedMore = A reviewer has vetoed this patchset.
+gb.write = write
+gb.comment = comment
+gb.preview = preview
+gb.leaveComment = leave a comment...
+gb.showHideDetails = show/hide details
+gb.acceptNewPatchsets = accept patchsets
+gb.acceptNewPatchsetsDescription = accept patchsets pushed to this repository
+gb.acceptNewTickets = allow new tickets
+gb.acceptNewTicketsDescription = allow creation of bug, enhancement, task ,etc tickets
+gb.requireApproval = require approvals
+gb.requireApprovalDescription = patchsets must be approved before merge button is enabled
+gb.topic = topic
+gb.proposalTickets = proposed changes
+gb.bugTickets = bugs
+gb.enhancementTickets = enhancements
+gb.taskTickets = tasks
+gb.questionTickets = questions
+gb.requestTickets = enhancements & tasks
+gb.yourCreatedTickets = created by you
+gb.yourWatchedTickets = watched by you
+gb.mentionsMeTickets = mentioning you
+gb.updatedBy = updated by
+gb.sort = sort
+gb.sortNewest = newest
+gb.sortOldest = oldest
+gb.sortMostRecentlyUpdated = recently updated
+gb.sortLeastRecentlyUpdated = least recently updated
+gb.sortMostComments = most comments
+gb.sortLeastComments = least comments
+gb.sortMostPatchsetRevisions = most patchset revisions
+gb.sortLeastPatchsetRevisions = least patchset revisions
+gb.sortMostVotes = most votes
+gb.sortLeastVotes = least votes
+gb.topicsAndLabels = topics & labels
+gb.milestones = milestones
+gb.noMilestoneSelected = no milestone selected
+gb.notSpecified = not specified
+gb.due = due
+gb.queries = queries
+gb.searchTicketsTooltip = search {0} tickets
+gb.searchTickets = search tickets
+gb.new = new
+gb.newTicket = new ticket
+gb.editTicket = edit ticket
+gb.ticketsWelcome = You can use tickets to organize your todo list, discuss bugs, and to collaborate on patchsets.
+gb.createFirstTicket = create your first ticket
+gb.title = title
+gb.changedStatus = changed the status
+gb.discussion = discussion
+gb.updated = updated
+gb.proposePatchset = propose a patchset
+gb.proposePatchsetNote = You are welcome to propose a patchset for this ticket.
+gb.proposeInstructions = To start, craft a patchset and upload it with Git. Gitblit will link your patchset to this ticket by the id.
+gb.proposeWith = propose a patchset with {0}
+gb.revisionHistory = revision history
+gb.merge = merge
+gb.action = action
+gb.patchset = patchset
+gb.all = all
+gb.mergeBase = merge base
+gb.checkout = checkout
+gb.checkoutViaCommandLine = Checkout via command line
+gb.checkoutViaCommandLineNote = You can checkout and test these changes locally from your clone of this repository.
+gb.checkoutStep1 = Fetch the current patchset \u2014 run this from your project directory
+gb.checkoutStep2 = Checkout the patchset to a new branch and review
+gb.mergingViaCommandLine = Merging via command line
+gb.mergingViaCommandLineNote = If you do not want to use the merge button or an automatic merge cannot be performed, you can perform a manual merge on the command line.
+gb.mergeStep1 = Check out a new branch to review the changes \u2014 run this from your project directory
+gb.mergeStep2 = Bring in the proposed changes and review
+gb.mergeStep3 = Merge the proposed changes and update the server
+gb.download = download
+gb.ptDescription = the Gitblit patchset tool
+gb.ptCheckout = Fetch & checkout the current patchset to a review branch
+gb.ptMerge = Fetch & merge the current patchset into your local branch
+gb.ptDescription1 = Barnum is a command-line companion for Git that simplifies the syntax for working with Gitblit Tickets and Patchsets.
+gb.ptSimplifiedCollaboration = simplified collaboration syntax
+gb.ptSimplifiedMerge = simplified merge syntax
+gb.ptDescription2 = Barnum requires Python 3 and native Git. It runs on Windows, Linux, and Mac OS X.
+gb.stepN = Step {0}
+gb.watchers = watchers
+gb.votes = votes
+gb.vote = vote for this {0}
+gb.watch = watch this {0}
+gb.removeVote = remove vote
+gb.stopWatching = stop watching
+gb.watching = watching
+gb.comments = comments
+gb.addComment = add comment
+gb.export = export
+gb.oneCommit = one commit
+gb.nCommits = {0} commits
+gb.addedOneCommit = added 1 commit
+gb.addedNCommits = added {0} commits
+gb.commitsInPatchsetN = commits in patchset {0}
+gb.patchsetN = patchset {0}
+gb.reviewedPatchsetRev = reviewed patchset {0} revision {1}: {2}
+gb.review = review
+gb.reviews = reviews
+gb.veto = veto
+gb.needsImprovement = needs improvement
+gb.looksGood = looks good
+gb.approve = approve
+gb.hasNotReviewed = has not reviewed
+gb.about = about
+gb.ticketN = ticket #{0}
+gb.disableUser = disable user
+gb.disableUserDescription = prevent this account from authenticating
+gb.any = any
+gb.milestoneProgress = {0} open, {1} closed
+gb.nOpenTickets = {0} open
+gb.nClosedTickets = {0} closed
+gb.nTotalTickets = {0} total
+gb.body = body
+gb.mergeSha = mergeSha
+gb.mergeTo = merge to
+gb.labels = labels
+gb.reviewers = reviewers
+gb.voters = voters
+gb.mentions = mentions
+gb.canNotProposePatchset = can not propose a patchset
+gb.repositoryIsMirror = This repository is a read-only mirror.
+gb.repositoryIsFrozen = This repository is frozen.
+gb.repositoryDoesNotAcceptPatchsets = This repository does not accept patchsets.
+gb.serverDoesNotAcceptPatchsets = This server does not accept patchsets.
+gb.ticketIsClosed = This ticket is closed.
+gb.mergeToDescription = default integration branch for merging ticket patchsets
+gb.anonymousCanNotPropose = Anonymous users can not propose patchsets.
+gb.youDoNotHaveClonePermission = You are not permitted to clone this repository.
+gb.myTickets = my tickets
+gb.yourAssignedTickets = assigned to you
+gb.newMilestone = new milestone
+gb.editMilestone = edit milestone
+gb.notifyChangedOpenTickets = send notification for changed open tickets
+gb.overdue = overdue
+gb.openMilestones = open milestones
+gb.closedMilestones = closed milestones
+gb.administration = administration
+gb.plugins = plugins
+gb.extensions = extensions
+
--
Gitblit v1.9.1