From 10f798a1fab5f7b23f498e2746b1b6a50010a288 Mon Sep 17 00:00:00 2001
From: Paul Martin <paul@paulsputer.com>
Date: Thu, 31 Mar 2016 03:47:56 -0400
Subject: [PATCH] Fix for #1034 Ticket Page Error
---
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 36c416e..f425615 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -770,4 +770,9 @@
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?
\ No newline at end of file
+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