From 45347a60645625d6634767d1b63753de416d215c Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 09 May 2014 08:06:24 -0400 Subject: [PATCH] Merge branch 'ticket/69' into develop --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 17 ++++++++++++++++- 1 files changed, 16 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index e52623e..d0c2d48 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -668,4 +668,19 @@ 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. \ No newline at end of file +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