From 222dd415e6f81173b09fd0b279702a6aa613a2e8 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sun, 26 Aug 2012 09:47:01 -0400
Subject: [PATCH] Merge pull request #33 from popstr/master

---
 src/com/gitblit/wicket/GitBlitWebApp.properties |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index bcd6337..0630a12 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -78,7 +78,7 @@
 gb.editUsers = edit users
 gb.confirmPassword = confirm password
 gb.restrictedRepositories = restricted repositories
-gb.canAdmin can admin
+gb.canAdmin = can admin
 gb.notRestricted = anonymous view, clone, & push
 gb.pushRestricted = authenticated push
 gb.cloneRestricted = authenticated clone & push
@@ -128,7 +128,7 @@
 gb.exclusions = exclusions
 gb.registration = registration
 gb.registrations = federation registrations
-gb.sendProposal propose
+gb.sendProposal = propose
 gb.status = status
 gb.origin = origin
 gb.headRef = default branch (HEAD)
@@ -312,4 +312,6 @@
 gb.duration.years = {0} years
 gb.authorizationControl = authorization control
 gb.allowAuthenticatedDescription = grant restricted access to all authenticated users
-gb.allowNamedDescription = grant restricted access to named users or teams
\ No newline at end of file
+gb.allowNamedDescription = grant restricted access to named users or teams
+gb.markdownFailure = Failed to parse Markdown content!
+gb.clearCache = clear cache
\ No newline at end of file

--
Gitblit v1.9.1