1 files changed, 139 insertions, 2 deletions
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 8f3a6aaf..86dd585f 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -18,7 +18,7 @@ gb.object = object
 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
@@ -511,4 +511,141 @@ 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
-\ No newline at end of file
+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}
+\ No newline at end of file