From 4bdd3958a1d1167063acdf3a0cca49ac56b8e446 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 01 Mar 2014 09:21:32 -0500
Subject: [PATCH] Add flatten string array to StringUtils
---
src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index f7e72ca..23cb649 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -8,6 +8,7 @@
gb.author = author
gb.committer = committer
gb.commit = commit
+gb.age = age
gb.tree = tree
gb.parent = parent
gb.url = URL
@@ -36,7 +37,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 +58,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 +261,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!
@@ -342,7 +343,7 @@
gb.canCreateDescription = can create personal repositories
gb.illegalPersonalRepositoryLocation = your personal repository must be located at \"{0}\"
gb.verifyCommitter = verify committer
-gb.verifyCommitterDescription = require committer identity to match pushing Gitblt user account
+gb.verifyCommitterDescription = require committer identity to match pushing Gitblit user account
gb.verifyCommitterNote = all merges require "--no-ff" to enforce committer identity
gb.repositoryPermissions = repository permissions
gb.userPermissions = user permissions
@@ -439,7 +440,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
@@ -495,4 +496,16 @@
gb.reflog = reflog
gb.active = active
gb.starred = starred
-gb.owned = owned
\ No newline at end of file
+gb.owned = owned
+gb.starredAndOwned = starred & owned
+gb.reviewPatchset = review {0} patchset {1}
+gb.todaysActivityStats = today / {1} commits by {2} authors
+gb.todaysActivityNone = today / none
+gb.noActivityToday = there has been no activity today
+gb.anonymousUser= anonymous
+gb.commitMessageRenderer = commit message renderer
+gb.diffStat = {0} insertions & {1} deletions
+gb.home = home
+gb.isMirror = this repository is a mirror
+gb.mirrorOf = mirror of {0}
+gb.mirrorWarning = this repository is a mirror and can not receive pushes
--
Gitblit v1.9.1