From bb79224f6b59d71098863ada728623bd728df6ff Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Mon, 23 Sep 2013 10:53:27 -0400
Subject: [PATCH] Fix potential NPE in cookie retrieval
---
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index e550c93..1f1a584 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -36,7 +36,7 @@
gb.commitdiff = commitdiff
gb.tickets = tickets
gb.pageFirst = first
-gb.pagePrevious prev
+gb.pagePrevious = prev
gb.pageNext = next
gb.head = HEAD
gb.blame = blame
@@ -57,7 +57,7 @@
gb.metrics = metrics
gb.stats = stats
gb.markdown = markdown
-gb.changedFiles = changed files
+gb.changedFiles = changed files
gb.filesAdded = {0} files added
gb.filesModified = {0} files modified
gb.filesDeleted = {0} files deleted
@@ -260,7 +260,7 @@
gb.failedToFindCommit = Failed to find commit \"{0}\" in {1}!
gb.couldNotFindFederationProposal = Could not find federation proposal!
gb.invalidUsernameOrPassword = Invalid username or password!
-gb.OneProposalToReview = There is 1 federation proposal awaiting review.
+gb.OneProposalToReview = There is 1 federation proposal awaiting review.
gb.nFederationProposalsToReview = There are {0} federation proposals awaiting review.
gb.couldNotFindTag = Could not find tag {0}
gb.couldNotCreateFederationProposal = Could not create federation proposal!
@@ -439,7 +439,7 @@
gb.sslCertificateGeneratedRestart = Successfully generated new server SSL certificate for {0}.\nYou must restart Gitblit to use the new certificate.\n\nIf you are launching with the '--alias' parameter you will have to set that to ''--alias {0}''.
gb.validity = validity
gb.siteName = site name
-gb.siteNameDescription = short, descriptive name of your server
+gb.siteNameDescription = short, descriptive name of your server
gb.excludeFromActivity = exclude from activity page
gb.isSparkleshared = repository is Sparkleshared
gb.owners = owners
@@ -501,4 +501,5 @@
gb.todaysActivityStats = today / {1} commits by {2} authors
gb.todaysActivityNone = today / none
gb.noActivityToday = there has been no activity today
-gb.anonymousUser= anonymous
\ No newline at end of file
+gb.anonymousUser= anonymous
+gb.commitMessageRenderer = commit message renderer
\ No newline at end of file
--
Gitblit v1.9.1