From d41034ad2ff334707a58ace5f3cd1de5fcfa1815 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 18 Sep 2015 08:30:29 -0400 Subject: [PATCH] Update to SSHD 1.0.0 --- src/main/java/com/gitblit/wicket/GitBlitWebApp.properties | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 43 insertions(+), 1 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties index bd5d89e..d037420 100644 --- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties +++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties @@ -561,6 +561,7 @@ gb.enhancementTickets = enhancements gb.taskTickets = tasks gb.questionTickets = questions +gb.maintenanceTickets = maintenance gb.requestTickets = enhancements & tasks gb.yourCreatedTickets = created by you gb.yourWatchedTickets = watched by you @@ -704,6 +705,7 @@ gb.initWithReadmeDescription = This will generate a simple README document for your repository. gb.initWithGitignore = Include a .gitignore file gb.initWithGitignoreDescription = This will insert a config file that instructs your Git clients to ignore files or directories that match defined patterns. +gb.pleaseSelectGitIgnore = Please select a .gitignore file gb.receive = receive gb.permissions = permissions gb.ownersDescription = Owners can manage all repository settings but they are not allowed to rename a repository unless it is their personal repository. @@ -721,4 +723,44 @@ gb.gc = GC gb.garbageCollection = Garbage Collection gb.garbageCollectionDescription = The garbage collector will pack loose objects pushed from clients and will remove unreferenced objects from the repository. -gb.commitMessageRendererDescription = Commit messages can be displayed as plaintext or as rendered markup. \ No newline at end of file +gb.commitMessageRendererDescription = Commit messages can be displayed as plaintext or as rendered markup. +gb.preferences = preferences +gb.accountPreferences = Account Preferences +gb.accountPreferencesDescription = Specify your account preferences +gb.languagePreference = Language Preference +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 +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 +gb.priority = priority +gb.severity = severity +gb.sortHighestPriority = highest priority +gb.sortLowestPriority = lowest priority +gb.sortHighestSeverity = highest severity +gb.sortLowestSeverity = lowest severity +gb.missingIntegrationBranchMore = The target integration branch does not exist in the repository! +gb.diffDeletedFileSkipped = (deleted) +gb.diffFileDiffTooLarge = Diff too large +gb.diffNewFile = New file +gb.diffDeletedFile = File was deleted +gb.diffRenamedFile = File was renamed from {0} +gb.diffCopiedFile = File was copied from {0} +gb.diffTruncated = Diff truncated after the above file +gb.opacityAdjust = Adjust opacity +gb.blinkComparator = Blink comparator +gb.imgdiffSubtract = Subtract (black = identical) +gb.deleteRepositoryHeader = Delete Repository +gb.deleteRepositoryDescription = Deleted repositories will be unrecoverable. +gb.show_whitespace = show whitespace +gb.ignore_whitespace = ignore whitespace \ No newline at end of file -- Gitblit v1.9.1