From 2c545280196ded9c042c0a8fa564048338bc19de Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Fri, 01 Apr 2016 14:02:37 -0400 Subject: [PATCH] Merge pull request #1035 from gitblit/1034-RepositoryPageLifecycle --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 28 +++++++++++++++++++++++++++- 1 files changed, 27 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index ce7b522..f425615 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -749,4 +749,30 @@ gb.sortLowestPriority = lowest priority gb.sortHighestSeverity = highest severity gb.sortLowestSeverity = lowest severity -gb.missingIntegrationBranchMore = The target integration branch does not exist in the repository! \ No newline at end of file +gb.missingIntegrationBranchMore = The target integration branch does not exist in the repository! +gb.diffDeletedFileSkipped = (deleted) +gb.diffFileDiffTooLarge = Diff too large +gb.diffNewFile = New file +gb.diffDeletedFile = File was deleted +gb.diffRenamedFile = File was renamed from {0} +gb.diffCopiedFile = File was copied from {0} +gb.diffTruncated = Diff truncated after the above file +gb.opacityAdjust = Adjust opacity +gb.blinkComparator = Blink comparator +gb.imgdiffSubtract = Subtract (black = identical) +gb.deleteRepositoryHeader = Delete Repository +gb.deleteRepositoryDescription = Deleted repositories will be unrecoverable. +gb.show_whitespace = show whitespace +gb.ignore_whitespace = ignore whitespace +gb.allRepositories = All Repositories +gb.oid = object id +gb.filestore = filestore +gb.filestoreStats = Filestore contains {0} files with a total size of {1}. ({2} remaining) +gb.statusChangedOn = status changed on +gb.statusChangedBy = status changed by +gb.filestoreHelp = How to use the Filestore? +gb.editFile = edit file +gb.continueEditing = Continue Editing +gb.commitChanges = Commit Changes +gb.fileNotMergeable = Unable to commit {0}. This file can not be automatically merged. +gb.fileCommitted = Successfully committed {0}. \ No newline at end of file -- Gitblit v1.9.1