From 33f3580f8f4499ac9cd4812872c94fcdd81a5829 Mon Sep 17 00:00:00 2001 From: Paul Martin <paul@paulsputer.com> Date: Mon, 28 Mar 2016 10:27:31 -0400 Subject: [PATCH] Merge pull request #1022 from gitblit/974-in-browser-doc-editor --- 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