From 90c9c9a9af20de464767c7a5726ae7088c6cab3b Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 04 Sep 2014 12:37:06 -0400
Subject: [PATCH] Fix NPE when anonymous admins are editing a repository (issue-490)

---
 src/main/java/com/gitblit/wicket/GitBlitWebApp.properties |   16 ++++++++++++++--
 1 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index 8117179..eb92e2d 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -727,6 +727,18 @@
 gb.accountPreferences = Account Preferences
 gb.accountPreferencesDescription = Specify your account preferences
 gb.languagePreference = Language Preference
-gb.languagePreferenceDescription = Select your preferred translation for the Gitblit UI
+gb.languagePreferenceDescription = Select your preferred translation for Gitblit
+gb.emailMeOnMyTicketChanges = Email me on my ticket changes
+gb.emailMeOnMyTicketChangesDescription  = Send me an email notification for changes that I make to a ticket
 gb.displayNameDescription = The preferred name for display
-gb.emailAddressDescription = The primary email address for receiving notifications
\ No newline at end of file
+gb.emailAddressDescription = The primary email address for receiving notifications
+gb.sshKeys = SSH Keys
+gb.sshKeysDescription = SSH public key authentication is a secure alternative to password authentication
+gb.addSshKey = Add SSH Key
+gb.key = Key
+gb.comment = Comment
+gb.sshKeyCommentDescription = Enter an optional comment. If blank, the comment will be extracted from the key data.
+gb.permission = Permission
+gb.sshKeyPermissionDescription = Specify the access permission for the SSH key
+gb.transportPreference = Transport Preference
+gb.transportPreferenceDescription = Set the transport that you prefer to use for cloning
\ No newline at end of file

--
Gitblit v1.9.1