From d17f433bf1c709b4daab58f503a142dd5e19cc4a Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 13 Dec 2011 16:52:19 -0500
Subject: [PATCH] Fixed null pointer possibility for gravatar profiles

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

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 2aa5107..c9afbc9 100644
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -92,7 +92,7 @@
 gb.isFrozenDescription = deny push operations
 gb.zip = zip
 gb.showReadme = show readme
-gb.showReadmeDescription = show a \"readme\" markdown file on the summary page
+gb.showReadmeDescription = show a \"readme\" Markdown file on the summary page
 gb.nameDescription = use '/' to group repositories.  e.g. libraries/mycoollib.git
 gb.ownerDescription = the owner may edit repository settings
 gb.blob = blob
@@ -106,7 +106,7 @@
 gb.federateThis = federate this repository
 gb.federateOrigin = federate the origin
 gb.excludeFromFederation = exclude from federation
-gb.excludeFromFederationDescription = block federated Gitblit instances from pulling this object
+gb.excludeFromFederationDescription = block federated Gitblit instances from pulling this account
 gb.tokens = federation tokens
 gb.tokenAllDescription = all repositories, users, & settings
 gb.tokenUnrDescription = all repositories & users
@@ -140,4 +140,59 @@
 gb.destinationUrl = send to
 gb.destinationUrlDescription = the url of the Gitblit instance to send your proposal
 gb.users = users
-gb.federation = federation
\ No newline at end of file
+gb.federation = federation
+gb.error = error
+gb.refresh = refresh
+gb.browse = browse
+gb.clone = clone
+gb.filter = filter
+gb.create = create
+gb.servers = servers
+gb.recent = recent
+gb.available = available
+gb.selected = selected
+gb.size = size
+gb.downloading = downloading
+gb.loading = loading
+gb.starting = starting
+gb.general = general
+gb.settings = settings
+gb.manage = manage
+gb.lastLogin = last login
+gb.skipSizeCalculation = skip size calculation
+gb.skipSizeCalculationDescription = do not calculate the repository size (reduces page load time)
+gb.skipSummaryMetrics = skip summary metrics
+gb.skipSummaryMetricsDescription = do not calculate metrics on the summary page (reduces page load time)
+gb.accessLevel = access level
+gb.default = default
+gb.setDefault = set default
+gb.since = since
+gb.status = status
+gb.bootDate = boot date
+gb.servletContainer = servlet container
+gb.heapMaximum = maximum heap
+gb.heapAllocated = allocated heap
+gb.heapUsed = used heap
+gb.free = free
+gb.version = version
+gb.releaseDate = release date
+gb.date = date
+gb.activity = activity
+gb.subscribe = subscribe
+gb.branch = branch
+gb.maxHits = max hits
+gb.recentActivity = recent activity
+gb.recentActivityStats = last {0} days / {1} commits by {2} authors
+gb.recentActivityNone = last {0} days / none
+gb.dailyActivity = daily activity
+gb.activeRepositories = active repositories
+gb.activeAuthors = active authors
+gb.commits = commits
+gb.teams = teams
+gb.teamName = team name
+gb.teamMembers = team members
+gb.teamMemberships = team memberships
+gb.newTeam = new team
+gb.permittedTeams = permitted teams
+gb.emptyRepository = empty repository
+gb.repositoryUrl = repository url
\ No newline at end of file

--
Gitblit v1.9.1