diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index f6354ed89..9c643d926 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
@@ -170,7 +170,6 @@ 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
@@ -358,7 +357,7 @@ gb.pushPermission = {0} (push)
 gb.createPermission = {0} (push, ref creation)
 gb.deletePermission = {0} (push, ref creation+deletion)
 gb.rewindPermission = {0} (push, ref creation+deletion+rewind)
-gb.permission = permission
+gb.permission = Permission
 gb.regexPermission = this permission is set from regular expression \"{0}\"
 gb.accessDenied = access denied
 gb.busyCollectingGarbage = sorry, Gitblit is busy collecting garbage in {0}
@@ -644,7 +643,7 @@ gb.patchsetN = patchset {0}
 gb.reviewedPatchsetRev = reviewed patchset {0} revision {1}: {2}
 gb.review = review
 gb.reviews = reviews
-gb.veto = veto 
+gb.veto = veto
 gb.needsImprovement = needs improvement
 gb.looksGood = looks good
 gb.approve = approve
@@ -723,7 +722,7 @@ gb.federationStrategyDescription = Control if and how to federate this repositor
 gb.federationSetsDescription = This repository will be included in the selected federation sets.
 gb.miscellaneous = miscellaneous
 gb.originDescription = The url from which this repository was cloned.
-gb.gc = GC 
+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.
@@ -740,9 +739,8 @@ 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.sshKeyComment = 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
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_cs.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_cs.properties
index a7a5277f8..cc01a51ce 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_cs.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_cs.properties
@@ -243,7 +243,6 @@ gb.expired=vypr\u0161el
 gb.dailyActivity=denn\u00ed aktivita
 gb.validity=platnost
 gb.query=dotaz
-gb.ticketState=Stav \u00fakolu
 gb.to=do
 gb.newTicket=nov\u00fd \u00fakol
 gb.download=st\u00e1hnout
@@ -426,6 +425,7 @@ gb.fileNotMergeable=Nelze prov\u00e9st commit {0}. Tento soubor nelze automatick
 gb.patchsetNotApprovedMore=Posuzovatel mus\u00ed schv\u00e1lit tuto sadu zm\u011bn.
 gb.teamPermission=opr\u00e1vn\u011bn\u00ed nastavil "{0}" \u010dlenstv\u00ed v t\u00fdmu
 gb.ticketsWelcome=M\u016f\u017eete pou\u017e\u00edt \u00fakoly k organizaci va\u0161eho seznamu \u00fakol\u016f, diskutovat chyby a spolupracovat na sad\u00e1ch zm\u011bn.
+gb.sshKeyComment=Koment\u00e1\u0159
 gb.sshKeyCommentDescription=Vlo\u017ete voliteln\u00fd koment\u00e1\u0159. Pokud bude pr\u00e1zdn\u00fd, bude automaticky vyta\u017een z dat kl\u00ed\u010de.
 gb.feed=kan\u00e1l
 gb.recentActivityNone=posledn\u00edch {0} dn\u00ed / nic
@@ -659,7 +659,7 @@ gb.ownerPermission=vlastn\u00edk repozit\u00e1\u0159e
 gb.requireApproval=vy\u017eaduje schv\u00e1len\u00ed
 gb.verifyCommitterDescription=vy\u017eaduje aby se identita v\u00fdvoj\u00e1\u0159e shodovala s Gitblit \u00fa\u010dtem pou\u017eit\u00fdm pro push
 gb.responsible=zodpov\u011bdn\u00fd
-gb.accessPermissionsDescription=omezit p\u0159\u00edstup na u\u017eivatel\u00e9 a t\u00fdmy\n
+gb.accessPermissionsDescription=omezit p\u0159\u00edstup na u\u017eivatel\u00e9 a t\u00fdmy
 gb.namedPushPolicy=Omezit Push (Pojmenovan\u00fd)
 gb.viewPolicy=Omezit prohl\u00ed\u017een\u00ed, klonov\u00e1n\u00ed a Push
 gb.raw=raw
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
index 519515295..677144eb8 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
@@ -140,7 +140,7 @@ gb.federationResults = Verbindungs-Pull-Ergebnis
 gb.federationSets = federation sets
 gb.message = Nachricht
 gb.myUrlDescription = Die \u00f6ffentlich zugreifbare URL f\u00fcr Ihre Gitblit-Instanz
-gb.destinationUrl = Senden an 
+gb.destinationUrl = Senden an
 gb.destinationUrlDescription = Die URL der Gitblit-Instanz, an welche die Anfrage gestellt werden soll
 gb.users = Benutzer
 gb.federation = Verbindungen (Federation)
@@ -170,7 +170,6 @@ gb.accessLevel = Zugangsebene
 gb.default = Default
 gb.setDefault = Setze Default
 gb.since = seit
-gb.status = Status
 gb.bootDate = Boot-Zeitpunkt
 gb.servletContainer = Servlet container
 gb.heapMaximum = Maximaler Heap
@@ -314,7 +313,7 @@ gb.duration.oneYear = 1 Jahr
 gb.duration.years = {0} Jahren
 gb.authorizationControl = Zugriffsrechte
 gb.allowAuthenticatedDescription = Allen authentifizierten Benutzern RW+ Recht gew\u00e4hren
-gb.allownameddescription = Benutzern und Teams feingranulare Rechte gew\u00e4hren
+gb.allowNamedDescription = Benutzern und Teams feingranulare Rechte gew\u00e4hren
 gb.markdownFailure = Markdown Inhalt konnte nicht geparst werden!
 gb.clearCache = Cache leeren
 gb.projects = Projekte
@@ -432,7 +431,7 @@ gb.pleaseGenerateClientCertificate = Bitte generieren Sie ein Client Zertifikat
 gb.clientCertificateBundleSent = Client-Zertifikat-Bundel f\u00fcr {0} gesendet
 gb.enterKeystorePassword = Bitte geben Sie das Gitblit-Keystore-Passwort ein
 gb.warning = Warnung
-gb.jcwWarning = Ihrem Java Runtime Environment fehlen die \"JCE Unlimited Strength Jurisdiction Policy\" Dateien.\nDies schr\u00e4nkt die L\u00e4nge der Passw\u00f6rter, die Sie zum Verschl\u00fcsseln Ihrer Keystores verwenden k\u00f6nnen, auf 7 Zeichen ein.\nDiese Policy-Dateien sind ein optionaler Download von Oracle.\n\nM\u00f6chten Sie fortfahren und die Zertifikat-Infrastruktur trotzdem erstellen?\n\nWenn Sie mit Nein antworten, wird Ihr Browser die Oracle Download-Seite \u00f6ffnen, auf welcher Sie die Policy-Dateien herunterladen k\u00f6nnen.
+gb.jceWarning = Ihrem Java Runtime Environment fehlen die \"JCE Unlimited Strength Jurisdiction Policy\" Dateien.\nDies schr\u00e4nkt die L\u00e4nge der Passw\u00f6rter, die Sie zum Verschl\u00fcsseln Ihrer Keystores verwenden k\u00f6nnen, auf 7 Zeichen ein.\nDiese Policy-Dateien sind ein optionaler Download von Oracle.\n\nM\u00f6chten Sie fortfahren und die Zertifikat-Infrastruktur trotzdem erstellen?\n\nWenn Sie mit Nein antworten, wird Ihr Browser die Oracle Download-Seite \u00f6ffnen, auf welcher Sie die Policy-Dateien herunterladen k\u00f6nnen.
 gb.maxActivityCommits = Maximale Commits Aktivit\u00e4t
 gb.maxActivityCommitsDescription = Maximale Anzahl von Commits die auf der Aktivit\u00e4tsseite dargestellt werden
 gb.noMaximum = Kein Maximum
@@ -522,7 +521,7 @@ gb.mergedPatchset = Merge des Patchset durchgef\u00fchrt
 gb.commented = kommentierte
 gb.noDescriptionGiven = keine Beschreibung hinterlegt
 gb.toBranch = nach {0}
-gb.createdBy = angelegt durch 
+gb.createdBy = angelegt durch
 gb.oneParticipant = {0} Teilnehmer
 gb.nParticipants = {0} Teilnehmer
 gb.noComments = keine Kommentare
@@ -592,7 +591,7 @@ gb.editTicket = Bearbeite Ticket
 gb.ticketsWelcome = Sie k\u00f6nnen Tickets verwenden, um Ihre Todo-Liste zu verwalten, Fehler zu diskutieren und bei der Erstellung von Patchsets zusammen zu arbeiten.
 gb.createFirstTicket = Erstellen Sie Ihr erstes Ticket
 gb.title = \u00dcberschrift
-gb.changedStatus = hat Status ge\u00e4ndert 
+gb.changedStatus = hat Status ge\u00e4ndert
 gb.discussion = Diskussion
 gb.updated = aktualisiert
 gb.proposePatchset = Patchset Vorschlagen
@@ -720,7 +719,7 @@ gb.federationStrategyDescription = Bestimmen Sie, ob und wie dieses Repository m
 gb.federationSetsDescription = Dieses Repository wird in den ausgew\u00e4hlten Verbindungssets enthalten sein.
 gb.miscellaneous = Sonstiges
 gb.originDescription = Die URL, von welcher dieses Repository geklont wurde.
-gb.gc = GC 
+gb.gc = GC
 gb.garbageCollection = Garbage Collection
 gb.garbageCollectionDescription = Die Garbage Collection b\u00fcndelt freie Objekte, welche von Clients gepusht wurden und entfernt nicht mehr referenzierte Objekte aus dem Repository.
 gb.commitMessageRendererDescription = Commit Messages k\u00f6nnen als reiner Text oder gerendertes Markup dargestellt werden.
@@ -737,9 +736,8 @@ gb.sshKeys = SSH Keys
 gb.sshKeysDescription = SSH Public Key Authentifizierung ist eine sichere Alternative zur Authentifizierung mit Passwort
 gb.addSshKey = SSH Key hinzuf\u00fcgen
 gb.key = Key
-gb.comment = Kommentar
+gb.sshKeyComment = Kommentar
 gb.sshKeyCommentDescription = Geben Sie optional einen Kommentar ein. Falls Sie dies nicht tun, wird der Kommentar aus dem Key extrahiert.
-gb.permission = Berechtigung
 
 gb.sshKeyPermissionDescription = Geben Sie die Zugriffberechtigung f\u00fcr den SSH Key an
 gb.transportPreference = \u00dcbertragungseinstellungen
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
index 2569cc674..2865aa912 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
@@ -18,7 +18,7 @@ gb.object = Objeto
 gb.ticketId = Id Ticket
 gb.ticketAssigned = Asignado
 gb.ticketOpenDate = Fecha de apertura
-gb.ticketState = Estado
+gb.ticketStatus = Estado
 gb.ticketComments = Comentarios
 gb.view = Ver
 gb.local = Local
@@ -58,12 +58,12 @@ gb.rename = Renombrar
 gb.metrics = Movimientos
 gb.stats = Estadísticas
 gb.markdown = Markdown
-gb.changedFiles = Archivos cambiados 
+gb.changedFiles = Archivos cambiados
 gb.filesAdded = {0} Archivos a\u00F1adidos
-gb.filesModified = {0} Archivos modificados 
-gb.filesDeleted = {0} Archivos eliminados 
-gb.filesCopied = {0} Archivos copiados 
-gb.filesRenamed = {0} Archivos renombrados 
+gb.filesModified = {0} Archivos modificados
+gb.filesDeleted = {0} Archivos eliminados
+gb.filesCopied = {0} Archivos copiados
+gb.filesRenamed = {0} Archivos renombrados
 gb.missingUsername = Usuario omitido
 gb.edit = Editar
 gb.searchTypeTooltip = Seleccionar tipo de b\u00FAsqueda
@@ -170,7 +170,6 @@ gb.accessLevel = Nivel de acceso
 gb.default = Predeterminado
 gb.setDefault = Poner predeterminado
 gb.since = Desde
-gb.status = Estado
 gb.bootDate = Fecha de inicio
 gb.servletContainer = Contenedor ServLet
 gb.heapMaximum = Pila m\u00E1xima
@@ -238,7 +237,7 @@ gb.passwordTooShort = La contrase\u00F1a es muy corta. La longitud m\u00EDnima e
 gb.passwordChanged = Contrase\u00F1a cambiada satisfactoriamente.
 gb.passwordChangeAborted = Cambio de contrase\u00F1a abortado.
 gb.pleaseSetRepositoryName = \u00A1Por favor introduce un nombre para el repositorio!
-gb.illegalLeadingSlash = Referencias a la carpeta ra\i00EDz (/) estu00E1n prohibidas.
+gb.illegalLeadingSlash = Referencias a la carpeta ra\u00EDz (/) estu00E1n prohibidas.
 gb.illegalRelativeSlash = Referencias relativas a la carpeta (../) est\u00E1n prohibidas.
 gb.illegalCharacterRepositoryName = \u00A1Caracter ilegal ''{0}'' en el nombre del repositorio!
 gb.selectAccessRestriction = \u00A1Por favor selecciona la restricci\u00F3n de acceso!
@@ -254,8 +253,8 @@ gb.userCreated = Nuevo usuario ''{0}'' creado satisfactoriamente.
 gb.couldNotFindFederationRegistration = \u00A1No se pudo encontrar el registro de federaci\u00F3n!
 gb.failedToFindGravatarProfile = Fallo al buscar el perfil Gravatar de {0}
 gb.branchStats = {0} consigna(s) y {1} etiqueta(s) en {2}
-gb.repositoryNotSpecified = /u00A1Repositorio no especificado!
-gb.repositoryNotSpecifiedFor = /u00A1Repositorio no especificado para {0}!
+gb.repositoryNotSpecified = \u00A1Repositorio no especificado!
+gb.repositoryNotSpecifiedFor = \u00A1Repositorio no especificado para {0}!
 gb.canNotLoadRepository = No se puede cargar el repositorio
 gb.commitIsNull = La consigna es nula
 gb.unauthorizedAccessForRepository = Acceso no autorizado al repositorio
@@ -272,9 +271,9 @@ gb.proposalReceived = Propuesta recibida satisfactoriamente por {0}.
 gb.noGitblitFound = Lo siento, {0} no puede encontrar una instancia de GitBlit en {1}.
 gb.noProposals = Lo siento, {0} no acepta propuestas en este momento.
 gb.noFederation = Lo siento, {0} no est\u00E1 configurado para Federar con ninguna instancia de GitBlit.
-gb.proposalFailed = /u00A1Lo siento, {0} no ha recibido ning\u00FAn dato de propuesta!
-gb.proposalError = /u00A1Lo siento, {0} informa de que ha ocurrido un error inesperado!
-gb.failedToSendProposal = /u00A1Fallo al enviar la propuesta!
+gb.proposalFailed = \u00A1Lo siento, {0} no ha recibido ning\u00FAn dato de propuesta!
+gb.proposalError = \u00A1Lo siento, {0} informa de que ha ocurrido un error inesperado!
+gb.failedToSendProposal = \u00A1Fallo al enviar la propuesta!
 gb.userServiceDoesNotPermitAddUser = \u00A1{0} no permite a\u00F1adir una cuenta de usuario!
 gb.userServiceDoesNotPermitPasswordChanges = \u00A1{0} no permite cambio de contrase\u00F1a!
 gb.displayName = Nombre
@@ -412,7 +411,7 @@ gb.keyCompromise = Clave de compromiso
 gb.caCompromise = Compromiso CA
 gb.affiliationChanged = Afiliaci\u00F3n cambiada
 gb.superseded = Sustituida
-gb.cessationOfOperation = Cese de operaci\u00F3n 
+gb.cessationOfOperation = Cese de operaci\u00F3n
 gb.privilegeWithdrawn = Privilegios retirados
 gb.time.inMinutes = en {0} mints
 gb.time.inHours = en {0} horas
@@ -421,7 +420,7 @@ gb.hostname = Nombre de host
 gb.hostnameRequired = Por favor, introduzca un nombre de host
 gb.newSSLCertificate = Nuevo certificado SSL del servidor
 gb.newCertificateDefaults = Nuevo certificado predeterminado
-gb.duration = Duraci\u00F3n 
+gb.duration = Duraci\u00F3n
 gb.certificateRevoked = El cretificado {0,n\u00FAmero,0} ha sido revocado
 gb.clientCertificateGenerated = Nuevo certificado de cliente generado correctamente para {0}
 gb.sslCertificateGenerated = Nuevo certificado de SSL generado correctamente para {0}
@@ -441,15 +440,15 @@ gb.serveCertificate = Servidor https con este certificado
 gb.sslCertificateGeneratedRestart = Certificado SSL generado correctamente para  {0}.\nDebes reiniciar Gitblit para usar el nuevo certificado.\n\nSi lo has iniciado con la opci\u00F3n  '--alias' deber\u00E1s ajustar dicha opci\u00F3n a ''--alias {0}''.
 gb.validity = Vigencia
 gb.siteName = Nombre del sitio
-gb.siteNameDescription = Nombre corto y descriptivo de tu servidor 
+gb.siteNameDescription = Nombre corto y descriptivo de tu servidor
 gb.excludeFromActivity = Excluir de la p\u00E1gina de actividad
 gb.isSparkleshared = compartido mediante Sparkleshared
 gb.owners = Propiet\u00E1rios
 gb.sessionEnded = La sesi\u00F3n ha sido cerrada
 gb.closeBrowser = Porfavor cierre el navegador para terminar correctamente la sesi\u00F3n.
-b.doesNotExistInTree = {0} no existe en el \u00E1rbol {1}
+gb.doesNotExistInTree = {0} no existe en el \u00E1rbol {1}
 gb.enableIncrementalPushTags = Etiquetar incrementalmente al empujar
-gb.useIncrementalPushTagsDescription = Al empujar, etiquetar autom\u00E1ticamente cada punta de la rama con un n\u00FAmero incremental de revisi\u00F3n 
+gb.useIncrementalPushTagsDescription = Al empujar, etiquetar autom\u00E1ticamente cada punta de la rama con un n\u00FAmero incremental de revisi\u00F3n
 gb.incrementalPushTagMessage = Auto-etiquetado [{0}] rama al empujar
 gb.externalPermissions = {0} los permisos de acceso son mantenidos externamente
 gb.viewAccess = No tienes acceso de lectura o escritura a Gitblit
@@ -506,7 +505,7 @@ gb.noActivityToday = hoy no ha habido actividad
 gb.anonymousUser= an\u00F3nimo
 gb.commitMessageRenderer = Procesador de mensaje en consignas
 gb.diffStat = {0} inserciones | {1} supresiones
-b.home = Home
+gb.home = Home
 gb.isMirror = Este repositorio es un espejo
 gb.mirrorOf = Espejo de {0}
 gb.mirrorWarning = Este repositorio es un espejo y no se le puede empujar
@@ -643,7 +642,7 @@ gb.patchsetN = parche {0}
 gb.reviewedPatchsetRev = parche revisado {0} revisi\u00F3n {1}: {2}
 gb.review = revista
 gb.reviews = revisiones
-gb.veto = veto 
+gb.veto = veto
 gb.needsImprovement = necesita mejorar
 gb.looksGood = parece bueno
 gb.approve = aprobar
@@ -671,6 +670,7 @@ gb.repositoryDoesNotAcceptPatchsets = Este Repositorio no acepta parches.
 gb.serverDoesNotAcceptPatchsets = Este Servidor-Git no acepta parches.
 gb.ticketIsClosed = Este ticket est\u00E1 cerrado.
 gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches
+gb.sshKeyComment = Comentar
 
 # This last property for unit tests to test successful loading of the resource file
 gb.loadLang = Espa\u00f1ol
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
index 8b765fd2b..f02748c0f 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
@@ -49,7 +49,7 @@ gb.tagger = tagger
 gb.moreHistory = plus d'historique...
 gb.difftocurrent = diff to current
 gb.search = recherche
-gb.searchForAuthor = Recherche des livraisons dont l'auteur est 
+gb.searchForAuthor = Recherche des livraisons dont l'auteur est
 gb.searchForCommitter = Recherche des livraisons livr\u00e9es par
 gb.addition = ajout
 gb.modification = modification
@@ -108,7 +108,7 @@ gb.federateThis = f\u00e9d\u00e9rer ce d\u00e9p\u00f4t
 gb.federateOrigin = f\u00e9d\u00e9rer "origin"
 gb.excludeFromFederation = exclure de la f\u00e9d\u00e9ration
 gb.excludeFromFederationDescription = emp\u00eacher les instances Gitblit f\u00e9d\u00e9r\u00e9e de "puller" ce compte
-gb.tokens = jettons de la f\u00e9d\u00e9ration 
+gb.tokens = jettons de la f\u00e9d\u00e9ration
 gb.tokenAllDescription = tous les d\u00e9p\u00f4ts, utilisateurs & param\u00e8tres
 gb.tokenUnrDescription = tous les d\u00e9p\u00f4ts & utilisateurs
 gb.tokenJurDescription = tous les d\u00e9p\u00f4ts
@@ -170,7 +170,6 @@ gb.accessLevel = niveau d'acc\u00e8s
 gb.default = d\u00e9faut
 gb.setDefault = d\u00e9finir par d\u00e9faut
 gb.since = depuis
-gb.status = \u00e9tat
 gb.bootDate = date de d\u00e9marrage
 gb.servletContainer = conteneur de servlet
 gb.heapMaximum = pile maximum
@@ -438,7 +437,7 @@ gb.maxActivityCommitsDescription = nombre maximum de livraisons pour contribuer
 gb.noMaximum = illimit\u00e9
 gb.attributes = attributes
 gb.serveCertificate = servir https avec ce certificat
-gb.sslCertificateGeneratedRestart = Un nouveau certificat serveur SSL a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 avec succ\u00e8s pour {0}.\Gitblit doit \u00eatre red\u00e9marrer pour prendre en compte le nouveau certificat.\n\nSi vous utilisez l'option de demarrage '--alias', v\u00e9rifiez qu'elle est d\u00e9finie comme suit : ''--alias {0}''.
+gb.sslCertificateGeneratedRestart = Un nouveau certificat serveur SSL a \u00e9t\u00e9 g\u00e9n\u00e9r\u00e9 avec succ\u00e8s pour {0}.\nGitblit doit \u00eatre red\u00e9marrer pour prendre en compte le nouveau certificat.\n\nSi vous utilisez l'option de demarrage '--alias', v\u00e9rifiez qu'elle est d\u00e9finie comme suit : ''--alias {0}''.
 gb.validity = validit\u00e9
 gb.siteName = nom du site
 gb.siteNameDescription = Nom court et descriptif du serveur
@@ -643,7 +642,7 @@ gb.patchsetN = correctif {0}
 gb.reviewedPatchsetRev = correctif approuv\u00e9 {0} revision {1}: {2}
 gb.review = v\u00e9rification
 gb.reviews = v\u00e9rifications
-gb.veto = v\u00e9to 
+gb.veto = v\u00e9to
 gb.needsImprovement = demande am\u00e9lioration
 gb.looksGood = semble bon
 gb.approve = approuver
@@ -683,6 +682,7 @@ gb.diffTruncated = Affichage de diff\u00e9rences supprim\u00e9e apr\u00e8s le fi
 gb.opacityAdjust = ajuster l'opacit\u00e9
 gb.blinkComparator = Comparateur \u00e0 clignotement
 gb.imgdiffSubtract = Diff\u00e9rence (noir = identique)
+gb.sshKeyComment = Commentaire
 
 # This last property for unit tests to test successful loading of the resource file
 gb.loadLang = fran\u00e7ais
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_it.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_it.properties
index cc5a2cd80..e0c406fe1 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_it.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_it.properties
@@ -170,7 +170,6 @@ gb.accessLevel = livello di access
 gb.default = predefinito
 gb.setDefault = imposta predefinito
 gb.since = da
-gb.status = stato
 gb.bootDate = data di avvio del server
 gb.servletContainer = servlet container
 gb.heapMaximum = memoria massima
@@ -324,7 +323,7 @@ gb.copyToClipboard = copia negli appunti
 gb.fork = ramificazione
 gb.forks = ramificazioni
 gb.forkRepository = crea una ramificazione {0}?
-gb.repositoryForked = ramificazione creata per {0} 
+gb.repositoryForked = ramificazione creata per {0}
 gb.repositoryForkFailed= ramificazione fallita
 gb.personalRepositories = repository personali
 gb.allowForks = consenti ramificazioni
@@ -597,7 +596,7 @@ gb.discussion = discussione
 gb.updated = aggiornato
 gb.proposePatchset = proponi una patch
 gb.proposePatchsetNote = Sei il benvenuto nel proporre una patch per questo ticket.
-gb.proposeInstructions = Per iniziare, crea una patch e fanne l'upload con Git. Gitblit collegerà la tua patch a questo ticket per id. 
+gb.proposeInstructions = Per iniziare, crea una patch e fanne l'upload con Git. Gitblit collegerà la tua patch a questo ticket per id.
 gb.proposeWith = Proponi una  patch con {0}
 gb.revisionHistory = cronologia revisioni
 gb.merge = merge
@@ -643,7 +642,7 @@ gb.patchsetN = patch {0}
 gb.reviewedPatchsetRev = patch analizzata {0} revisione {1}: {2}
 gb.review = revisione
 gb.reviews = revisioni
-gb.veto = veto 
+gb.veto = veto
 gb.needsImprovement = da migliorare
 gb.looksGood = sembra buona
 gb.approve = approvata
@@ -720,7 +719,7 @@ gb.federationStrategyDescription = Stabilisce se e come federare questo reposito
 gb.federationSetsDescription = Questo repository sarà incluso nelle federazioni selezionate.
 gb.miscellaneous = miscellanea
 gb.originDescription = URL da cui questo repository è stato clonato
-gb.gc = GC 
+gb.gc = GC
 gb.garbageCollection = Garbage Collection
 gb.garbageCollectionDescription = Lo spazzino (GC) comprimerà gli oggetti inviati da client Git and rimuoverà dal repository oggetti non più referenziati.
 gb.commitMessageRendererDescription = I messaggi di commit possono essere visualizzati come testo semplice o decorati come markdown
@@ -737,9 +736,8 @@ gb.sshKeys = Chiavi SSH
 gb.sshKeysDescription = Autenticazione tramite chiave pubblica SSH è una alternativa sicura all'autenticazione tramite password
 gb.addSshKey = Aggiungi una chiave SSH
 gb.key = Chiave
-gb.comment = Commento
+gb.sshKeyComment = Commento
 gb.sshKeyCommentDescription = Aggiungi opzionalmente un commento. Se vuoto, il commento sarà estratto dalla chiave stessa.
-gb.permission = Permesso
 gb.sshKeyPermissionDescription = Definisci il il livello di accesso per la chiave SSH
 gb.transportPreference = Preferenze di trasporto
 gb.transportPreferenceDescription = Specifica il protocollo di trasporto che preferisci usare per le operazioni di clone
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
index add25403d..6caa450d6 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
@@ -17,7 +17,7 @@ gb.object = object
 gb.ticketId = \u30c1\u30b1\u30c3\u30c8ID
 gb.ticketAssigned = \u5272\u308a\u5f53\u3066\u6e08\u307f
 gb.ticketOpenDate = \u30aa\u30fc\u30d7\u30f3\u65e5
-gb.ticketState = \u72b6\u614b
+gb.ticketStatus= \u72b6\u614b
 gb.ticketComments = \u30b3\u30e1\u30f3\u30c8
 gb.view = \u898b\u308b
 gb.local = \u30ed\u30fc\u30ab\u30eb
@@ -57,7 +57,7 @@ gb.rename = \u30ea\u30cd\u30fc\u30e0
 gb.metrics = \u6307\u6a19
 gb.stats = \u7d71\u8a08
 gb.markdown = markdown
-gb.changedFiles = \u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb 
+gb.changedFiles = \u5909\u66f4\u3055\u308c\u305f\u30d5\u30a1\u30a4\u30eb
 gb.filesAdded = {0} \u30d5\u30a1\u30a4\u30eb\u304c\u8ffd\u52a0
 gb.filesModified = {0} \u30d5\u30a1\u30a4\u30eb\u304c\u5909\u66f4
 gb.filesDeleted = {0} \u30d5\u30a1\u30a4\u30eb\u304c\u524a\u9664
@@ -131,7 +131,7 @@ gb.registrations = federation registrations
 gb.sendProposal = propose
 gb.status = status
 gb.origin = origin
-gb.headRef = \u30c7\u30d5\u30a9\u30eb\u30c8\u30d6\u30e9\u30f3\u30c1 (HEAD) 
+gb.headRef = \u30c7\u30d5\u30a9\u30eb\u30c8\u30d6\u30e9\u30f3\u30c1 (HEAD)
 gb.headRefDescription = HEAD \u306e\u30ea\u30f3\u30af\u5148 ref \u3092\u5909\u66f4\u3059\u308b e.g. refs/heads/master
 gb.federationStrategy = \u30d5\u30a7\u30c7\u30ec\u30fc\u30b7\u30e7\u30f3\u6226\u7565
 gb.federationRegistration = federation registration
@@ -165,11 +165,10 @@ gb.skipSizeCalculation = \u30b5\u30a4\u30ba\u8a08\u7b97\u3092\u30b9\u30ad\u30c3\
 gb.skipSizeCalculationDescription = \u30ea\u30dd\u30b8\u30c8\u30ea\u306e\u30b5\u30a4\u30ba\u3092\u8a08\u7b97\u3057\u306a\u3044 (\u30da\u30fc\u30b8\u306e\u30ed\u30fc\u30c9\u6642\u9593\u3092\u524a\u6e1b)
 gb.skipSummaryMetrics = \u6982\u8981\u3067\u306e\u6307\u6a19\u3092\u30b9\u30ad\u30c3\u30d7
 gb.skipSummaryMetricsDescription = \u6982\u8981\u30da\u30fc\u30b8\u3067\u6307\u6a19\u3092\u8a08\u7b97\u3057\u306a\u3044 (\u30da\u30fc\u30b8\u306e\u30ed\u30fc\u30c9\u6642\u9593\u3092\u524a\u6e1b)
-gb.accessLevel = \u30a2\u30af\u30bb\u30b9\u30ec\u30d9\u30eb 
+gb.accessLevel = \u30a2\u30af\u30bb\u30b9\u30ec\u30d9\u30eb
 gb.default = \u30c7\u30d5\u30a9\u30eb\u30c8
 gb.setDefault = \u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u8a2d\u5b9a
 gb.since = since
-gb.status = status
 gb.bootDate = boot date
 gb.servletContainer = \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30b3\u30f3\u30c6\u30ca
 gb.heapMaximum = \u6700\u5927\u30d2\u30fc\u30d7
@@ -261,7 +260,7 @@ gb.unauthorizedAccessForRepository = \u30ea\u30dd\u30b8\u30c8\u30ea\u3078\u306e\
 gb.failedToFindCommit = Failed to find commit \"{0}\" in {1} for {2} page!
 gb.couldNotFindFederationProposal = Could not find federation proposal!
 gb.invalidUsernameOrPassword = \u30e6\u30fc\u30b6\u30fc\u540d\u307e\u305f\u306f\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u7121\u52b9\u3067\u3059!
-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 = {0} \u30bf\u30b0\u3092\u898b\u3064\u304b\u308a\u307e\u305b\u3093\u3067\u3057\u305f
 gb.couldNotCreateFederationProposal = Could not create federation proposal!
@@ -440,7 +439,7 @@ gb.serveCertificate = serve https with this certificate
 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 = \u6d3b\u52d5\u30da\u30fc\u30b8\u304b\u3089\u9664\u5916\u3059\u308b
 gb.isSparkleshared = repository is Sparkleshared
 gb.owners = owners
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
index 23ab11870..31f3b05b1 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
@@ -58,7 +58,7 @@ gb.rename = \uC774\uB984\uBCC0\uACBD
 gb.metrics = \uBA54\uD2B8\uB9AD
 gb.stats = \uC0C1\uD0DC
 gb.markdown = \uB9C8\uD06C\uB2E4\uC6B4
-gb.changedFiles = \uD30C\uC77C \uBCC0\uACBD\uB428 
+gb.changedFiles = \uD30C\uC77C \uBCC0\uACBD\uB428
 gb.filesAdded = {0}\uAC1C \uD30C\uC77C \uCD94\uAC00\uB428
 gb.filesModified = {0}\uAC1C \uD30C\uC77C \uBCC0\uACBD\uB428
 gb.filesDeleted = {0}\uAC1C \uD30C\uC77C \uC0AD\uC81C\uB428
@@ -170,7 +170,6 @@ gb.accessLevel = \uC811\uC18D \uB808\uBCA8
 gb.default = \uB514\uD3F4\uD2B8
 gb.setDefault = \uB514\uD3F4\uD2B8 \uC124\uC815
 gb.since = since
-gb.status = \uC0C1\uD0DC
 gb.bootDate = \uBD80\uD305 \uC77C\uC790
 gb.servletContainer = \uC11C\uBE14\uB9BF \uCEE8\uD14C\uC774\uB108
 gb.heapMaximum = \uCD5C\uB300 \uD799
@@ -470,7 +469,7 @@ gb.pushedOneCommitTo = 1 \uAC1C \uCEE4\uBC0B\uC774 \uD478\uC2DC\uB428
 gb.commitsTo = {0} \uAC1C \uCEE4\uBC0B
 gb.oneCommitTo = 1 \uAC1C \uCEE4\uBC0B
 gb.byNAuthors = {0} \uBA85\uC758 \uC791\uC131\uC790
-gb.byOneAuthor = {0} \uC5D0 \uC758\uD574 
+gb.byOneAuthor = {0} \uC5D0 \uC758\uD574
 gb.viewComparison = {0} \uCEE4\uBC0B\uC758 \uBE44\uAD50 \uBCF4\uAE30 \u00BB
 gb.nMoreCommits = {0} \uAC1C \uB354 \u00BB
 gb.oneMoreCommit = 1 \uAC1C \uB354 \u00BB
@@ -723,26 +722,25 @@ gb.federationStrategyDescription = \uB2E4\uB978 Gitblit \uACFC \uD398\uB354\uB80
 gb.federationSetsDescription = \uC774 \uC800\uC7A5\uC18C\uB294 \uC120\uD0DD\uB41C \uD398\uB354\uB808\uC774\uC158 \uC14B\uC5D0 \uD3EC\uD568\uB429\uB2C8\uB2E4.
 gb.miscellaneous = \uAE30\uD0C0
 gb.originDescription = \uC774 \uC800\uC7A5\uC18C\uAC00 \uD074\uB860\uB41C \uACF3\uC758 url
-gb.gc = GC 
+gb.gc = GC
 gb.garbageCollection = \uAC00\uBE44\uC9C0 \uCEEC\uB809\uC158
 gb.garbageCollectionDescription = \uAC00\uBE44\uC9C0 \uCEEC\uB809\uD130\uB294 \uD074\uB77C\uC774\uC5B8\uD2B8\uC5D0\uC11C \uD478\uC2DC\uD55C \uB290\uC2A8\uD55C \uC624\uBE0C\uC81D\uD2B8\uB97C \uD328\uD0B9\uD558\uACE0, \uC800\uC7A5\uC18C\uC5D0\uC11C \uCC38\uC870\uD558\uC9C0 \uC54A\uB294 \uC624\uBE0C\uC81D\uD2B8\uB97C \uC0AD\uC81C\uD569\uB2C8\uB2E4.
 gb.commitMessageRendererDescription = \uCEE4\uBC0B \uBA54\uC2DC\uC9C0\uB294 \uD3C9\uBB38 \uB610\uB294 \uB9C8\uD06C\uC5C5\uC73C\uB85C \uB80C\uB354\uB9C1\uD558\uC5EC \uD45C\uC2DC\uB420 \uC218 \uC788\uC2B5\uB2C8\uB2E4.
 gb.preferences = \uC124\uC815
 gb.accountPreferences = \uACC4\uC815 \uC124\uC815
 gb.accountPreferencesDescription = \uACC4\uC815 \uC124\uC815\uC744 \uC9C0\uC815\uD569\uB2C8\uB2E4.
-gb.languagePreference = \uC5B8\uC5B4 \uC124\uC815 
+gb.languagePreference = \uC5B8\uC5B4 \uC124\uC815
 gb.languagePreferenceDescription = \uC120\uD638\uD558\uB294 \uC5B8\uC5B4\uB97C \uC120\uD0DD\uD558\uC138\uC694.
 gb.emailMeOnMyTicketChanges = \uB0B4 \uD2F0\uCF13\uC774 \uBCC0\uACBD\uB418\uBA74 \uC774\uBA54\uC77C\uB85C \uC54C\uB9BC
 gb.emailMeOnMyTicketChangesDescription  = \uB0B4\uAC00 \uB9CC\uB4E0 \uD2F0\uCF13\uC758 \uBCC0\uACBD\uB418\uBA74 \uBCC0\uACBD\uC0AC\uD56D\uC744 \uB098\uC758 \uC774\uBA54\uC77C\uB85C \uC54C\uB824\uC90C
 gb.displayNameDescription = \uD45C\uC2DC\uB420 \uC774\uB984
 gb.emailAddressDescription = \uC54C\uB9BC\uC744 \uBC1B\uAE30\uC704\uD55C \uC8FC \uC774\uBA54\uC77C
 gb.sshKeys = SSH \uD0A4
-gb.sshKeysDescription = SSH \uACF5\uAC1C\uD0A4 \uC778\uC99D\uC740 \uD328\uC2A4\uC6CC\uB4DC \uC778\uC99D\uC744 \uB300\uCCB4\uD558\uB294 \uC548\uC804\uD55C \uB300\uC548\uC785\uB2C8\uB2E4. 
+gb.sshKeysDescription = SSH \uACF5\uAC1C\uD0A4 \uC778\uC99D\uC740 \uD328\uC2A4\uC6CC\uB4DC \uC778\uC99D\uC744 \uB300\uCCB4\uD558\uB294 \uC548\uC804\uD55C \uB300\uC548\uC785\uB2C8\uB2E4.
 gb.addSshKey = SSH \uD0A4 \uCD94\uAC00
 gb.key = \uD0A4
-gb.comment = \uC124\uBA85
+gb.sshKeyComment = \uC124\uBA85
 gb.sshKeyCommentDescription = \uC0AC\uC6A9\uC790 \uC120\uD0DD\uC778 \uC124\uBA85\uC744 \uCD94\uAC00\uD558\uC138\uC694. \uBE44\uC6CC \uB450\uBA74 \uD0A4 \uB370\uC774\uD130\uC5D0\uC11C \uCD94\uCD9C\uD558\uC5EC \uCC44\uC6CC\uC9D1\uB2C8\uB2E4.
-gb.permission = \uAD8C\uD55C
 gb.sshKeyPermissionDescription = SSH \uD0A4\uC758 \uC811\uC18D \uAD8C\uD55C\uC744 \uC9C0\uC815\uD558\uC138\uC694.
 gb.transportPreference = \uC804\uC1A1 \uC124\uC815
 gb.transportPreferenceDescription = \uD074\uB860\uC2DC \uC0AC\uC6A9\uD560 \uC124\uC815\uC744 \uC9C0\uC815\uD558\uC138\uC694.
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
index 7dd68b39f..a869e96b6 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
@@ -18,7 +18,7 @@ gb.object = object
 gb.ticketId = ticket id
 gb.ticketAssigned = toegewezen
 gb.ticketOpenDate = open datum
-gb.ticketState = status
+gb.ticketStatus = status
 gb.ticketComments = commentaar
 gb.view = view
 gb.local = local
@@ -170,7 +170,6 @@ gb.accessLevel = toegangsniveau
 gb.default = standaard
 gb.setDefault = instellen als standaard
 gb.since = sinds
-gb.status = status
 gb.bootDate = boot datum
 gb.servletContainer = servlet container
 gb.heapMaximum = maximum heap
@@ -210,7 +209,7 @@ gb.filters = filters
 gb.generalDescription = algemene instellingen
 gb.accessPermissionsDescription = beperk toegang voor gebruikers en teams
 gb.accessPermissionsForUserDescription = stel teamlidmaatschappen in of geef toegang tot specifieke besloten repositories
-gb.accessPermissionsForTeamDescription = stel teamlidmaatschappen in en geef toegang tot specifieke besloten repositories 
+gb.accessPermissionsForTeamDescription = stel teamlidmaatschappen in en geef toegang tot specifieke besloten repositories
 gb.federationRepositoryDescription = deel deze repositorie met andere Gitblit servers
 gb.hookScriptsDescription = run Groovy scripts bij pushes naar deze Gitblit server
 gb.reset = reset
@@ -262,7 +261,7 @@ gb.unauthorizedAccessForRepository = Niet toegestane toegang tot repositorie
 gb.failedToFindCommit = Het vinden van commit \"{0}\" in {1} voor {2} pagina is mislukt!
 gb.couldNotFindFederationProposal = Kon federatievoorstel niet vinden!
 gb.invalidUsernameOrPassword = Onjuiste gebruikersnaam of wachtwoord!
-gb.OneProposalToReview = Er is 1 federatie voorstel dat wacht op review. 
+gb.OneProposalToReview = Er is 1 federatie voorstel dat wacht op review.
 gb.nFederationProposalsToReview = Er zijn {0} federatie verzoeken die wachten op review.
 gb.couldNotFindTag = Kon tag {0} niet vinden
 gb.couldNotCreateFederationProposal = Kon geen federatie voorstel maken!
@@ -292,7 +291,7 @@ gb.empty = leeg
 gb.inherited = geërfd
 gb.deleteRepository = Verwijder repositorie \"{0}\"?
 gb.repositoryDeleted = Repositorie ''{0}'' verwijderd.
-gb.repositoryDeleteFailed = Verwijdering van repositorie ''{0}'' mislukt! 
+gb.repositoryDeleteFailed = Verwijdering van repositorie ''{0}'' mislukt!
 gb.deleteUser = Verwijder gebruiker \"{0}\"?
 gb.userDeleted = Gebruiker ''{0}'' verwijderd.
 gb.userDeleteFailed = Verwijdering van gebruiker ''{0}'' mislukt!
@@ -608,7 +607,7 @@ gb.mergeBase = merge base
 gb.checkout = checkout
 gb.checkoutViaCommandLine =  Checkout via commandline
 gb.checkoutViaCommandLineNote = U kunt deze wijzigingen uitchecken en lokaal testen vanuit uw eigen kopie van deze repositorie.
-gb.checkoutStep1 = Dowbload the actuele patchset \u2014 run deze vanuit uw eigen projectdirectorie
+gb.checkoutStep1 = Download the actuele patchset \u2014 run deze vanuit uw eigen projectdirectorie
 gb.checkoutStep2 = Check de patchset uit naar een nieuwe branch en review hem
 gb.mergingViaCommandLine = Mergen via commandline
 gb.mergingViaCommandLineNote = Als u de merge knop niet wilt gebruiken of een automatische merge niet kan worden uitgevoerd kunt u een handmatige merge op de commandline uitvoeren.
@@ -643,7 +642,7 @@ gb.patchsetN = patchset {0}
 gb.reviewedPatchsetRev = reviewed patchset {0} revisie {1}: {2}
 gb.review = review
 gb.reviews = reviews
-gb.veto = veto 
+gb.veto = veto
 gb.needsImprovement = kan beter
 gb.looksGood = ziet er goed uit
 gb.approve = goedkeuren
@@ -720,7 +719,7 @@ gb.federationStrategyDescription = Bepaal of en hoe deze repositorie te federere
 gb.federationSetsDescription = Deze repository zal worden opgenomen in de geselecteerde federatie sets.
 gb.miscellaneous = diversen
 gb.originDescription = De url vanaf welke deze repositorie was gecloned.
-gb.gc = GC 
+gb.gc = GC
 gb.garbageCollection = Garbage Collection
 gb.garbageCollectionDescription = De garbage collector zal losse objecten die gepushed zijn van clients samenvoegen en zal ongereferentieerde objecten uit de repository verwijderen.
 gb.commitMessageRendererDescription = Commit meldingen kunnen worden getoond als platte tekst of als gerenderde markup.
@@ -737,9 +736,8 @@ gb.sshKeys = SSH Sleutels
 gb.sshKeysDescription = SSH publiekesleutelauthenticatie is een veilig alternatief voor wachtwoordauthenticatie
 gb.addSshKey = Voeg SSH Sleutel toe
 gb.key = Sleutel
-gb.comment = Opmerking
+gb.sshKeyComment = Opmerking
 gb.sshKeyCommentDescription = Voeg een optionele opmerking toe. Indien leeg zal de opmerking uit de sleutelgegevens worden gehaald.
-gb.permission = Permissie
 gb.sshKeyPermissionDescription = Specificeer de toegangsrechten voor de SSH sleutel
 gb.transportPreference = Transportvoorkeuren
 gb.transportPreferenceDescription = Stel de transportmethode in die u wenst voor het clonen
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_no.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_no.properties
index d3a6355ab..96522ec66 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_no.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_no.properties
@@ -49,8 +49,8 @@ gb.tagger = tagger
 gb.moreHistory = mer historikk...
 gb.difftocurrent = diff med gjeldende
 gb.search = s\u00F8k
-gb.searchForAuthor = S\u00F8k etter commits skrever av 
-gb.searchForCommitter = S\u00F8k etter commits committet av 
+gb.searchForAuthor = S\u00F8k etter commits skrever av
+gb.searchForCommitter = S\u00F8k etter commits committet av
 gb.addition = lagt til
 gb.modification = endring
 gb.deletion = sletting
@@ -88,14 +88,14 @@ gb.useTicketsDescription = skrivebeskyttede, distribuerte Ticgit issues
 gb.useDocsDescription = eumererer Markdown dokumentasjon i repositoriet
 gb.showRemoteBranchesDescription = vis remote branches
 gb.canAdminDescription = kan administere Gitblit server
-gb.permittedUsers = tillatte brukere 
+gb.permittedUsers = tillatte brukere
 gb.isFrozen = er frosset
 gb.isFrozenDescription = avvis push operasjoner
 gb.zip = zip
 gb.showReadme = vis readme
 gb.showReadmeDescription = vis en \"readme\" Markdown fil p\u00e5 oppsummeringssiden
 gb.nameDescription = bruk '/'  for \u00e5 gruppere repositorier. F.eks libraries/mycoollib.git
-gb.ownerDescription = eieren kan redigere repository-innstillinge 
+gb.ownerDescription = eieren kan redigere repository-innstillinge
 gb.blob = blob
 gb.commitActivityTrend = aktivitetstrend for commits
 gb.commitActivityDOW = commit aktivitet gruppert p\u00e5 ukedag
@@ -136,7 +136,7 @@ gb.headRef = standard branch (HEAD)
 gb.headRefDescription = endre ref'en HEAD peker mot, f.eks refs/heads/master
 gb.federationStrategy = federeringsstrategi
 gb.federationRegistration = federeringsregistrering
-gb.federationResults = resultat av federerings pull 
+gb.federationResults = resultat av federerings pull
 gb.federationSets = federeringssett
 gb.message = melding
 gb.myUrlDescription = den offentlige url'en for din Gitblit instans
@@ -156,8 +156,8 @@ gb.available = tilgjengelig
 gb.selected = valgt
 gb.size = st\u00F8rrelse
 gb.downloading = laster ned
-gb.loading = laster 
-gb.starting = starter 
+gb.loading = laster
+gb.starting = starter
 gb.general = generelt
 gb.settings = innstillinger
 gb.manage = administrere
@@ -170,7 +170,6 @@ gb.accessLevel = tilgangsniv\u00e5
 gb.default = standardverdi
 gb.setDefault = sett standardverdi
 gb.since = siden
-gb.status = status
 gb.bootDate = oppstartstidspunkt
 gb.servletContainer = servlet container
 gb.heapMaximum = maks minne (heap)
@@ -193,7 +192,7 @@ gb.activeAuthors = aktive forfattere
 gb.commits = commits
 gb.teams = team
 gb.teamName = teamnavn
-gb.teamMembers = teammedlemmer 
+gb.teamMembers = teammedlemmer
 gb.teamMemberships = teammedlemskap
 gb.newTeam = nytt team
 gb.permittedTeams = tillatte team
@@ -207,11 +206,11 @@ gb.customFields = custom fields
 gb.customFieldsDescription = custom fields tilgjengelige for Groovy hooks
 gb.accessPermissions = tilgangsprivileger
 gb.filters = filtre
-gb.generalDescription = vanlige innstillinger 
+gb.generalDescription = vanlige innstillinger
 gb.accessPermissionsDescription = begrens tilgang vha brukere og team
 gb.accessPermissionsForUserDescription = sett teammedlemskap eller gi tilgang til spesifikke repositorier
 gb.accessPermissionsForTeamDescription = sett teammedlemskap eller gi tilgang til spesifikke repositorier
-gb.federationRepositoryDescription = del dette repositoriett med andre Gitblit servere 
+gb.federationRepositoryDescription = del dette repositoriett med andre Gitblit servere
 gb.hookScriptsDescription = kj\u00F8r Groovy scripts ved pushes til denne Gitblit serveren
 gb.reset = reset
 gb.pages = sider
@@ -225,7 +224,7 @@ gb.noHits = ingen treff
 gb.authored = forfattet
 gb.committed = committet
 gb.indexedBranches = indekserte brancher
-gb.indexedBranchesDescription = velg branchene som skal inkluderes i din Lucene indeks. 
+gb.indexedBranchesDescription = velg branchene som skal inkluderes i din Lucene indeks.
 gb.noIndexedRepositoriesWarning = ingen av dine repositorier er satt opp med Lucene indeksering
 gb.undefinedQueryWarning = sp\u00F8rringen er udefinert
 gb.noSelectedRepositoriesWarning = vennligst velg en eller flere epositorier!
@@ -238,7 +237,7 @@ gb.passwordTooShort = Passorder er for kort. Minimum lengde er {0} tegn.
 gb.passwordChanged = Passorder er endret.
 gb.passwordChangeAborted = Passordendring ble avbrutt.
 gb.pleaseSetRepositoryName = Vennligst sett repositorynavnet!
-gb.illegalLeadingSlash = Katalognavn kan ikke begynne med '/' 
+gb.illegalLeadingSlash = Katalognavn kan ikke begynne med '/'
 gb.illegalRelativeSlash = Relative katalognavn (../) kan ikke benyttes.
 gb.illegalCharacterRepositoryName = Ugyldig tegn ''{0}'' i repositorynavnet!
 gb.selectAccessRestriction = Vennligst velg tilgangskontrollniv\u00e5!
@@ -263,7 +262,7 @@ gb.failedToFindCommit = Fant ikke commit \"{0}\" i {1}!
 gb.couldNotFindFederationProposal = Fant ikke fefereringsforslag!
 gb.invalidUsernameOrPassword = Ugyldig brukernavn eller passord!
 gb.OneProposalToReview = 1 federeringsforslag venter p\u00e5 behandling.
-gb.nFederationProposalsToReview = {0} federeingsforslag venter p\u00e5 behandling. 
+gb.nFederationProposalsToReview = {0} federeingsforslag venter p\u00e5 behandling.
 gb.couldNotFindTag = Fant ikke tag {0}
 gb.couldNotCreateFederationProposal = Kunne ikke opprette federeringsforslag!
 gb.pleaseSetGitblitUrl = Vennligst angi din Gitblit url!
@@ -333,7 +332,7 @@ gb.forkedFrom = forket fra
 gb.canFork = kan forke
 gb.canForkDescription = kan forke autoriserte repositorier til personlige repositorier
 gb.myFork = se min fork
-gb.forksProhibited = forkig er ikke tillattt 
+gb.forksProhibited = forkig er ikke tillattt
 gb.forksProhibitedWarning = dette repositoriet tillater ikke forking
 gb.noForks = {0} har ingen forks
 gb.forkNotAuthorized = beklager, du har ikke tillatelse til \u00e5 forke {0}
@@ -341,16 +340,16 @@ gb.forkInProgress = forking p\u00e5g\u00e5r
 gb.preparingFork = forbereder din fork...
 gb.isFork = er en fork
 gb.canCreate = kan opprette
-gb.canCreateDescription = kan opprette personlige repositorier 
+gb.canCreateDescription = kan opprette personlige repositorier
 gb.illegalPersonalRepositoryLocation = ditt personlige repository m\u00e5 v\u00e6re plassert p\u00e5 \"{0}\"
 gb.verifyCommitter = verifiser committer
-gb.verifyCommitterDescription = krev at committer identitet matcher pushing Gitblit brukerkonto 
+gb.verifyCommitterDescription = krev at committer identitet matcher pushing Gitblit brukerkonto
 gb.verifyCommitterNote = alle merger krever "--no-ff" for \u00e5 beolde kjent committer identitet
 gb.repositoryPermissions = repository tilganger
 gb.userPermissions = brukertilganger
 gb.teamPermissions = teamtilganger
 gb.add = legg til
-gb.noPermission = SLETT DENNE TILGANGEN 
+gb.noPermission = SLETT DENNE TILGANGEN
 gb.excludePermission = {0} (ekskluder)
 gb.viewPermission = {0} (vis)
 gb.clonePermission = {0} (clone)
@@ -358,7 +357,7 @@ gb.pushPermission = {0} (push)
 gb.createPermission = {0} (push, ref creation)
 gb.deletePermission = {0} (push, ref creation+deletion)
 gb.rewindPermission = {0} (push, ref creation+deletion+rewind)
-gb.permission = tilgang
+gb.permission = Tilgang
 gb.regexPermission = denne tilgangen er gitt av regul\u00e6ruttrykket \"{0}\"
 gb.accessDenied = ingen tilgang
 gb.busyCollectingGarbage = beklager, Gitblit er opptatt med \u00e5 samle s\u00F8ppel {0}
@@ -399,21 +398,21 @@ gb.passwordHintRequired = passord hint er p\u00e5krevd!
 gb.viewCertificate = vis sertifikat
 gb.subject = subject
 gb.issuer = utsteder
-gb.validFrom = gyldig fra 
+gb.validFrom = gyldig fra
 gb.validUntil = gyldig til
 gb.publicKey = public key
 gb.signatureAlgorithm = signaturalgoritme
 gb.sha1FingerPrint = SHA-1 fingeravtrykk
 gb.md5FingerPrint = MD5 fingeravtrykk
 gb.reason = begrunnelse
-gb.revokeCertificateReason = Vennligst angi en grunn for tilbakekalling av sertifikatet. 
+gb.revokeCertificateReason = Vennligst angi en grunn for tilbakekalling av sertifikatet.
 gb.unspecified = uspesifisert
 gb.keyCompromise = n\u00F8kkelen er komprommitert
 gb.caCompromise = CA er komprommitert
 gb.affiliationChanged = tilknytning endret
 gb.superseded = erstattet
 gb.cessationOfOperation = opph\u00F8rt
-gb.privilegeWithdrawn = privileget er trukket tilbake 
+gb.privilegeWithdrawn = privileget er trukket tilbake
 gb.time.inMinutes = om {0} minutter
 gb.time.inHours = om {0} timer
 gb.time.inDays = om {0} dager
@@ -446,12 +445,12 @@ gb.excludeFromActivity = ekskluder fra aktivitetssiden
 gb.isSparkleshared = repositoriet er Sparkleshared
 gb.owners = eiere
 gb.sessionEnded = Sesjonen har blitt lukket
-gb.closeBrowser = Vennligst lukk nettleseren for \u00e5 avslutte sesjonen fullstendig. 
+gb.closeBrowser = Vennligst lukk nettleseren for \u00e5 avslutte sesjonen fullstendig.
 gb.doesNotExistInTree = {0} finnes ikke i treet  {1}
 gb.enableIncrementalPushTags = sl\u00e5 p\u00e5 inkrementelle push tags
 gb.useIncrementalPushTagsDescription = ved pushing til repositoriet, tag hver branch med et inkrementelt revisjonsnummer
 gb.incrementalPushTagMessage = Auto-tagget [{0}] branch ved push
-gb.externalPermissions = {0} tilgangsrettigheter blir vedlikeholdt eksternt. 
+gb.externalPermissions = {0} tilgangsrettigheter blir vedlikeholdt eksternt.
 gb.viewAccess = Du har hverken lese- eller skrivetilgang til Gitblit.
 gb.overview = oversikt
 gb.dashboard = dashboard
@@ -501,7 +500,7 @@ gb.owned = eid
 gb.starredAndOwned = fulgt og eid
 gb.reviewPatchset = gjennomgang {0} patchset {1}
 gb.todaysActivityStats = i dag / {1} commits av {2} forfattere
-gb.todaysActivityNone = i dag / ingen 
+gb.todaysActivityNone = i dag / ingen
 gb.noActivityToday = det har ikke v\u00e6rt noen aktivitet i dag
 gb.anonymousUser= anonym
 gb.commitMessageRenderer = commit melding renderer
@@ -510,7 +509,7 @@ gb.home = hjem
 gb.isMirror = dette repositoriet er et speil
 gb.mirrorOf = speiling av {0}
 gb.mirrorWarning = dette repositoriet er et speil, og kan ikke pushes til
-gb.docsWelcome1 = Du kan bruke dokumentasjon til \u00e5 dokumentrere ditt repository 
+gb.docsWelcome1 = Du kan bruke dokumentasjon til \u00e5 dokumentrere ditt repository
 gb.docsWelcome2 = Commit en README.md eller en  HOME.md fil for \u00e5 komme i gang
 gb.createReadme = lag en README
 gb.responsible = ansvarlig
@@ -586,7 +585,7 @@ gb.due = frist
 gb.queries = sp\u00F8rringer
 gb.searchTicketsTooltip = s\u00F8k {0} tickets
 gb.searchTickets = s\u00F8k tickets
-gb.new = ny 
+gb.new = ny
 gb.newTicket = ny ticket
 gb.editTicket = endre ticket
 gb.ticketsWelcome = Du kan bruke tickets til \u00e5 organisere din todo-liste, diskutere bugs og \u00e5 samarbeide om patchsets.
@@ -609,7 +608,7 @@ gb.checkout = checkout
 gb.checkoutViaCommandLine =  Checkout via kommandolinjen
 gb.checkoutViaCommandLineNote = Du kan sjekke ut og teste disse endringene lokalt fra din klone av dette repositoriet.
 gb.checkoutStep1 = Hent det gjeldende patchsettet \u2014 kj\u00F8r dette fra din prosjekt-katalog
-gb.checkoutStep2 = Checkout patchsettet til en ny branch og g\u00e5 igjennom koden 
+gb.checkoutStep2 = Checkout patchsettet til en ny branch og g\u00e5 igjennom koden
 gb.mergingViaCommandLine = Merging vha kommandolinjen
 gb.mergingViaCommandLineNote = Hvis du ikke \u00F8nsker \u00e5 bruke merge-knappen, eller hvis en automatisk merge ikke kan bli utf\u00F8rt, kan du gj\u00F8re en manuell merge p\u00e5 kommandolinjen.
 gb.mergeStep1 = Checkout en ny branch for \u00e5 g\u00e5 igjennom endringene \u2014 kj\u00F8r dette fra din prosjektkatalog
@@ -643,7 +642,7 @@ gb.patchsetN = patchsett {0}
 gb.reviewedPatchsetRev = gjennomgikk patchset {0} revisjon {1}: {2}
 gb.review = gjennomgang
 gb.reviews = gjennomganger
-gb.veto = veto 
+gb.veto = veto
 gb.needsImprovement = m\u00e5 forbedres
 gb.looksGood = ser bra ut
 gb.approve = godkjenne
@@ -694,11 +693,11 @@ gb.anonymousPolicyDescription = Alle kan se, clone ofg pushe til dette repositor
 gb.authenticatedPushPolicy = Begrens push (Autentisert)
 gb.authenticatedPushPolicyDescription = Alle kan se og klone dette repositoriet. Alle autentiserte brukere har lese og skrivetilgang.
 gb.namedPushPolicy = Begrens push (navngitt)
-gb.namedPushPolicyDescription = Alle kan se og klone repositoriet. Du bestemmer hvem som kan pushe. 
+gb.namedPushPolicyDescription = Alle kan se og klone repositoriet. Du bestemmer hvem som kan pushe.
 gb.clonePolicy = Begrens Clone og Push
 gb.clonePolicyDescription = Alle kan se dette repositoriet. Du bestemmer hvem som kan clone og pushe.
 gb.viewPolicy  = Begrense View, Clone og Push
-gb.viewPolicyDescription = Du bestemmer hvem som kan se, clone og pushe til dette repositoriet. 
+gb.viewPolicyDescription = Du bestemmer hvem som kan se, clone og pushe til dette repositoriet.
 gb.initialCommit = F\u00F8rste commit
 gb.initialCommitDescription = Dette vil la deg kunne <code>git clone</code> repositoriet med en gang. Hopp over dette skrittet hvis du allerede har kj\u00F8rt  if <code>git init</code> lokalt.
 gb.initWithReadme = Inkluder en README
@@ -720,7 +719,7 @@ gb.federationStrategyDescription = Kontroller om og hvordan dette repositoriet s
 gb.federationSetsDescription = Dette repositoriet vil bli inkludert i de valgte federeringssettene.
 gb.miscellaneous = ymse
 gb.originDescription = URL'en som dette repositoriet ble klonet fra.
-gb.gc = GC 
+gb.gc = GC
 gb.garbageCollection = Garbage Collection
 gb.garbageCollectionDescription = Garbage collectoren vil pakke sammen l\u00F8se objekter pushet fra klientene og fjerne objekter det ikke refereres til fra minnet.
 gb.commitMessageRendererDescription = Commit-meldinger kan vises som ren tekst, eller som markup.
@@ -737,11 +736,10 @@ gb.sshKeys = SSH n\u00F8kler
 gb.sshKeysDescription = SSH public key autentisering er et sikkert alternativ til autentisering med passord
 gb.addSshKey = Legg til SSH n\u00F8kkel
 gb.key = N\u00F8kkel
-gb.comment = Kommentar
+gb.sshKeyComment = Kommentar
 gb.sshKeyCommentDescription = Angi en valgfri kommentar. Kommentaren vil bli ekstrahert fra n\u00F8kkeldataene hvis blank
-gb.permission = Tilgang
 gb.sshKeyPermissionDescription = Angi tilgangsrettinghet for SSH n\u00F8kkelen
-gb.transportPreference = Foretrukket transport 
+gb.transportPreference = Foretrukket transport
 gb.transportPreferenceDescription = Sett transportmetoden du foretrekker for cloning
 
 # This last property for unit tests to test successful loading of the resource file
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
index 340723f7d..a4753e72f 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
@@ -17,7 +17,7 @@ gb.object = Obiekt
 gb.ticketId = Id ticketu
 gb.ticketAssigned = Przydzielony
 gb.ticketOpenDate = Data otwarcia
-gb.ticketState = Status
+gb.ticketStatus = Status
 gb.ticketComments = Komentarze
 gb.view = Widok
 gb.local = Lokalne
@@ -83,7 +83,7 @@ gb.notRestricted = Anonimowy podgl\u0105d, klonowanie i zapis
 gb.pushRestricted = Uwierzytelniony zapis
 gb.cloneRestricted = Uwierzytelnione klonowanie i zapis
 gb.viewRestricted = Uwierzytelniony podgl\u0105d, klonowanie i zapis
-gb.useTicketsDescription = Rozproszone zg\u0142oszenia Ticgit 
+gb.useTicketsDescription = Rozproszone zg\u0142oszenia Ticgit
 gb.useDocsDescription = Parsuj znaczniki Markdown w repozytorium
 gb.showRemoteBranchesDescription = Poka\u017C zdalne ga\u0142\u0119zie
 gb.canAdminDescription = Mo\u017Ce administrowa\u0107 serwerem Gitblit
@@ -108,7 +108,7 @@ gb.federateOrigin = Federuj origin
 gb.excludeFromFederation = Wy\u0142\u0105cz z federacji
 gb.excludeFromFederationDescription = Blokuj sfederowane instancje Gitblit od pobierania tego konta
 gb.tokens = Tokeny federacji
-gb.tokenAllDescription = Wszystkie repozytoria, u\u017Cytkownicy i ustawienia 
+gb.tokenAllDescription = Wszystkie repozytoria, u\u017Cytkownicy i ustawienia
 gb.tokenUnrDescription = Wszystkie repozytoria i u\u017Cytkownicy
 gb.tokenJurDescription = Wszystkie repozytoria
 gb.federatedRepositoryDefinitions = Definicje repozytori\u00F3w
@@ -169,7 +169,6 @@ gb.accessLevel = Poziom dost\u0119pu
 gb.default = Domy\u015Blny
 gb.setDefault = Ustaw domy\u015Blny
 gb.since = Od
-gb.status = Status
 gb.bootDate = Data uruchomienia
 gb.servletContainer = Kontener serwlet\u00F3w
 gb.heapMaximum = Maksymalny stos
@@ -361,7 +360,7 @@ gb.permission = uprawnienie
 gb.regexPermission = to uprawnienie jest nadane z wyra\u017Cenia regularnego \"{0}\"
 gb.accessDenied = dost\u0119p zabroniony
 gb.busyCollectingGarbage = Przepraszamy, Gitblit jest w trakcie od\u015Bmiecania zasob\u00F3w w {0}
-gb.gcPeriod = okres GC 
+gb.gcPeriod = okres GC
 gb.gcPeriodDescription = okres pomi\u0119dzy kolejnymi od\u015Bmieceniami
 gb.gcThreshold = pr\u00F3g GC
 gb.gcThresholdDescription = minimalna liczba wolnych obiekt\u00F3w jaka uruchomi wczesne od\u015Bmiecanie pami\u0119ci
@@ -461,7 +460,7 @@ gb.manual = r\u0119cznie
 gb.from = od
 gb.to = do
 gb.at = w
-gb.of = z 
+gb.of = z
 gb.in = w
 gb.moreChanges = wszystkie zmiany...
 gb.pushedNCommitsTo = wgra\u0142(a) {0} zmian do
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
index 9e697b4f8..26b6838d0 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
@@ -1,24 +1,24 @@
-gb.repository = repositório
-gb.owner = proprietário
-gb.description = descrição
-gb.lastChange = última alteração
+gb.repository = reposit\u00f3rio
+gb.owner = propriet\u00e1rio
+gb.description = descri\u00e7\u00e3o
+gb.lastChange = \u00faltima altera\u00e7\u00e3o
 gb.refs = refs
 gb.tag = tag
 gb.tags = tags
 gb.author = autor
 gb.committer = committer
 gb.commit = commit
-gb.tree = árvore
+gb.tree = \u00e1rvore
 gb.parent = parent
 gb.url = URL
-gb.history = histórico
+gb.history = hist\u00f3rico
 gb.raw = raw
 gb.object = object
 gb.ticketId = ticket id
-gb.ticketAssigned = atribuído
+gb.ticketAssigned = atribu\u00eddo
 gb.ticketOpenDate = data da abertura
-gb.ticketState = estado
-gb.ticketComments = comentários
+gb.ticketStatus = estado
+gb.ticketComments = coment\u00e1rios
 gb.view = visualizar
 gb.local = local
 gb.remote = remote
@@ -31,13 +31,13 @@ gb.allTags = todas as tags...
 gb.allBranches = todos os branches...
 gb.summary = resumo
 gb.ticket = ticket
-gb.newRepository = novo repositório
-gb.newUser = novo usuário
+gb.newRepository = novo reposit\u00f3rio
+gb.newUser = novo usu\u00e1rio
 gb.commitdiff = commitdiff
 gb.tickets = tickets
 gb.pageFirst = primeira
-gb.pagePrevious anterior
-gb.pageNext = próxima
+gb.pagePrevious = anterior
+gb.pageNext = pr\u00f3xima
 gb.head = HEAD
 gb.blame = blame
 gb.login = login
@@ -45,19 +45,19 @@ gb.logout = logout
 gb.username = username
 gb.password = password
 gb.tagger = tagger
-gb.moreHistory = mais histórico...
+gb.moreHistory = mais hist\u00f3rico...
 gb.difftocurrent = diff para a atual
 gb.search = pesquisar
-gb.searchForAuthor = Procurar por commits cujo autor é
+gb.searchForAuthor = Procurar por commits cujo autor \u00e9
 gb.searchForCommitter = Procurar por commits commitados por
 gb.addition = adicionados
 gb.modification = modificados
 gb.deletion = apagados
 gb.rename = renomear
-gb.metrics = métricas
-gb.stats = estatísticas
+gb.metrics = m\u00e9tricas
+gb.stats = estat\u00edsticas
 gb.markdown = markdown
-gb.changedFiles = arquivos alterados 
+gb.changedFiles = arquivos alterados
 gb.filesAdded = {0} arquivos adicionados
 gb.filesModified = {0} arquivos modificados
 gb.filesDeleted = {0} arquivos deletados
@@ -69,80 +69,80 @@ gb.searchTypeTooltip = Selecione o Tipo de Pesquisa
 gb.searchTooltip = Pesquisar {0}
 gb.delete = deletar
 gb.docs = docs
-gb.accessRestriction = restrição de acesso
+gb.accessRestriction = restri\u00e7\u00e3o de acesso
 gb.name = nome
 gb.enableTickets = ativar tickets
-gb.enableDocs = ativar documentação
+gb.enableDocs = ativar documenta\u00e7\u00e3o
 gb.save = salvar
 gb.showRemoteBranches = mostrar branches remotos
-gb.editUsers = editar usuários
+gb.editUsers = editar usu\u00e1rios
 gb.confirmPassword = confirmar password
-gb.restrictedRepositories = repositórios restritos
+gb.restrictedRepositories = reposit\u00f3rios restritos
 gb.canAdmin = pode administrar
-gb.notRestricted = visualização anônima, clone, & push
-gb.pushRestricted = push autênticado
-gb.cloneRestricted = clone & push autênticados
-gb.viewRestricted = view, clone, & push autênticados
-gb.useTicketsDescription = somente leitura, issues do Ticgit distribuídos
-gb.useDocsDescription = enumerar documentação Markdown no repositório
+gb.notRestricted = visualiza\u00e7\u00e3o an\u00f4nima, clone, & push
+gb.pushRestricted = push aut\u00eanticado
+gb.cloneRestricted = clone & push aut\u00eanticados
+gb.viewRestricted = view, clone, & push aut\u00eanticados
+gb.useTicketsDescription = somente leitura, issues do Ticgit distribu\u00eddos
+gb.useDocsDescription = enumerar documenta\u00e7\u00e3o Markdown no reposit\u00f3rio
 gb.showRemoteBranchesDescription = mostrar branches remotos
 gb.canAdminDescription = pode administrar o server Gitblit
-gb.permittedUsers = usuários autorizados
+gb.permittedUsers = usu\u00e1rios autorizados
 gb.isFrozen = congelar
 gb.isFrozenDescription = proibir fazer push
 gb.zip = zip
 gb.showReadme = mostrar readme
-gb.showReadmeDescription = mostrar um arquivo \"leia-me\" na página de apresentação do projeto
-gb.nameDescription = utilizer a '/' para agrupar repositórios.  e.g. libraries/mycoollib.git
-gb.ownerDescription = o proprietário pode editar configurações do repositório
+gb.showReadmeDescription = mostrar um arquivo \"leia-me\" na p\u00e1gina de apresenta\u00e7\u00e3o do projeto
+gb.nameDescription = utilizer a '/' para agrupar reposit\u00f3rios.  e.g. libraries/mycoollib.git
+gb.ownerDescription = o propriet\u00e1rio pode editar configura\u00e7\u00f5es do reposit\u00f3rio
 gb.blob = blob
-gb.commitActivityTrend = tendência dos commits
+gb.commitActivityTrend = tend\u00eancia dos commits
 gb.commitActivityDOW = commits por dia da semana
 gb.commitActivityAuthors = principais committers
 gb.feed = feed
 gb.cancel = cancelar
 gb.changePassword = alterar password
-gb.isFederated = está federado
-gb.federateThis = federar este repositório
+gb.isFederated = est\u00e1 federado
+gb.federateThis = federar este reposit\u00f3rio
 gb.federateOrigin = federar o origin
-gb.excludeFromFederation = excluir da federação
-gb.excludeFromFederationDescription = bloquear instâncias federadas do GitBlit de fazer pull desta conta
-gb.tokens = tokens de federação
-gb.tokenAllDescription = todos repositórios, usuários & configurações
-gb.tokenUnrDescription = todos repositórios & usuários
-gb.tokenJurDescription = todos repositórios
-gb.federatedRepositoryDefinitions = definições de repositório
-gb.federatedUserDefinitions = definições de usuários
-gb.federatedSettingDefinitions = definições de configurações
-gb.proposals = propostas de federações
+gb.excludeFromFederation = excluir da federa\u00e7\u00e3o
+gb.excludeFromFederationDescription = bloquear inst\u00e2ncias federadas do GitBlit de fazer pull desta conta
+gb.tokens = tokens de federa\u00e7\u00e3o
+gb.tokenAllDescription = todos reposit\u00f3rios, usu\u00e1rios & configura\u00e7\u00f5es
+gb.tokenUnrDescription = todos reposit\u00f3rios & usu\u00e1rios
+gb.tokenJurDescription = todos reposit\u00f3rios
+gb.federatedRepositoryDefinitions = defini\u00e7\u00f5es de reposit\u00f3rio
+gb.federatedUserDefinitions = defini\u00e7\u00f5es de usu\u00e1rios
+gb.federatedSettingDefinitions = defini\u00e7\u00f5es de configura\u00e7\u00f5es
+gb.proposals = propostas de federa\u00e7\u00f5es
 gb.received = recebidos
 gb.type = tipo
 gb.token = token
-gb.repositories = repositórios
+gb.repositories = reposit\u00f3rios
 gb.proposal = propostas
-gb.frequency = frequência
+gb.frequency = frequ\u00eancia
 gb.folder = pasta
-gb.lastPull = último pull
-gb.nextPull = próximo pull
-gb.inclusions = inclusões
-gb.exclusions = excluões
+gb.lastPull = \u00faltimo pull
+gb.nextPull = pr\u00f3ximo pull
+gb.inclusions = inclus\u00f5es
+gb.exclusions = exclu\u00f5es
 gb.registration = cadastro
-gb.registrations = cadastro de federações
+gb.registrations = cadastro de federa\u00e7\u00f5es
 gb.sendProposal = enviar proposta
 gb.status = status
 gb.origin = origin
 gb.headRef = default branch (HEAD)
 gb.headRefDescription = alterar a ref a qual a HEAD aponta. e.g. refs/heads/master
-gb.federationStrategy = estratégia de federação 
-gb.federationRegistration = cadastro de federações
-gb.federationResults = resultados dos pulls de federações
-gb.federationSets = ajustes de federações
+gb.federationStrategy = estrat\u00e9gia de federa\u00e7\u00e3o
+gb.federationRegistration = cadastro de federa\u00e7\u00f5es
+gb.federationResults = resultados dos pulls de federa\u00e7\u00f5es
+gb.federationSets = ajustes de federa\u00e7\u00f5es
 gb.message = mensagem
-gb.myUrlDescription = a url de acesso público para a instância Gitblit
+gb.myUrlDescription = a url de acesso p\u00fablico para a inst\u00e2ncia Gitblit
 gb.destinationUrl = enviar para
-gb.destinationUrlDescription = a url da intância do Gitblit para enviar sua proposta
-gb.users = usuários
-gb.federation = federação
+gb.destinationUrlDescription = a url da int\u00e2ncia do Gitblit para enviar sua proposta
+gb.users = usu\u00e1rios
+gb.federation = federa\u00e7\u00e3o
 gb.error = erro
 gb.refresh = atualizar
 gb.browse = navegar
@@ -151,170 +151,169 @@ gb.filter = filtrar
 gb.create = criar
 gb.servers = servidores
 gb.recent = recente
-gb.available = disponível
+gb.available = dispon\u00edvel
 gb.selected = selecionado
 gb.size = tamanho
 gb.downloading = downloading
 gb.loading = loading
 gb.starting = inciando
 gb.general = geral
-gb.settings = configurações
+gb.settings = configura\u00e7\u00f5es
 gb.manage = administrar
-gb.lastLogin = último login
-gb.skipSizeCalculation = ignorar cálculo do tamanho
-gb.skipSizeCalculationDescription = não calcular o tamanho do repositório (reduz o tempo de load da página)
-gb.skipSummaryMetrics = ignorar resumo das métricas
-gb.skipSummaryMetricsDescription = não calcular métricas na página de resumo
+gb.lastLogin = \u00faltimo login
+gb.skipSizeCalculation = ignorar c\u00e1lculo do tamanho
+gb.skipSizeCalculationDescription = n\u00e3o calcular o tamanho do reposit\u00f3rio (reduz o tempo de load da p\u00e1gina)
+gb.skipSummaryMetrics = ignorar resumo das m\u00e9tricas
+gb.skipSummaryMetricsDescription = n\u00e3o calcular m\u00e9tricas na p\u00e1gina de resumo
 gb.accessLevel = acesso
 gb.default = default
 gb.setDefault = tornar default
 gb.since = desde
-gb.status = status
 gb.bootDate = data do boot
 gb.servletContainer = servlet container
-gb.heapMaximum = heap máximo
+gb.heapMaximum = heap m\u00e1ximo
 gb.heapAllocated = alocar heap
 gb.heapUsed = usar heap
 gb.free = free
-gb.version = versão
+gb.version = vers\u00e3o
 gb.releaseDate = data de release
 gb.date = data
 gb.activity = atividade
 gb.subscribe = inscrever
 gb.branch = branch
-gb.maxHits = hits máximos
+gb.maxHits = hits m\u00e1ximos
 gb.recentActivity = atividade recente
-gb.recentActivityStats = últimos {0} dias / {1} commits por {2} autores
-gb.recentActivityNone = últimos {0} dias / nenhum
-gb.dailyActivity = atividade diária
-gb.activeRepositories = repositórios ativos
+gb.recentActivityStats = \u00faltimos {0} dias / {1} commits por {2} autores
+gb.recentActivityNone = \u00faltimos {0} dias / nenhum
+gb.dailyActivity = atividade di\u00e1ria
+gb.activeRepositories = reposit\u00f3rios ativos
 gb.activeAuthors = autores ativos
 gb.commits = commits
 gb.teams = equipes
 gb.teamName = nome da equipe
 gb.teamMembers = membros
-gb.teamMemberships = filiações em equipes
+gb.teamMemberships = filia\u00e7\u00f5es em equipes
 gb.newTeam = nova equipe
 gb.permittedTeams = equipes permitidas
-gb.emptyRepository = repositório vazio
-gb.repositoryUrl = url do repositório
+gb.emptyRepository = reposit\u00f3rio vazio
+gb.repositoryUrl = url do reposit\u00f3rio
 gb.mailingLists = listas de e-mails
 gb.preReceiveScripts = pre-receive scripts
 gb.postReceiveScripts = post-receive scripts
 gb.hookScripts = hook scripts
 gb.customFields = campos customizados
-gb.customFieldsDescription = campos customizados disponíveis para Groovy hooks
-gb.accessPermissions = permissões de acesso
+gb.customFieldsDescription = campos customizados dispon\u00edveis para Groovy hooks
+gb.accessPermissions = permiss\u00f5es de acesso
 gb.filters = filtros
-gb.generalDescription = configurações comuns
-gb.accessPermissionsDescription = restringir acesso por usuários e equipes
-gb.accessPermissionsForUserDescription = ajustar filiações em equipes ou garantir acesso a repositórios específicos
-gb.accessPermissionsForTeamDescription = ajustar membros da equipe e garantir acesso a repositórios específicos
-gb.federationRepositoryDescription = compartilhar este repositório com outros servidores Gitblit
+gb.generalDescription = configura\u00e7\u00f5es comuns
+gb.accessPermissionsDescription = restringir acesso por usu\u00e1rios e equipes
+gb.accessPermissionsForUserDescription = ajustar filia\u00e7\u00f5es em equipes ou garantir acesso a reposit\u00f3rios espec\u00edficos
+gb.accessPermissionsForTeamDescription = ajustar membros da equipe e garantir acesso a reposit\u00f3rios espec\u00edficos
+gb.federationRepositoryDescription = compartilhar este reposit\u00f3rio com outros servidores Gitblit
 gb.hookScriptsDescription = rodar scripts Groovy nos pushes para este servidor Gitblit
 gb.reset = reset
-gb.pages = páginas
+gb.pages = p\u00e1ginas
 gb.workingCopy = working copy
-gb.workingCopyWarning = este repositório tem uma working copy e não pode receber pushes
+gb.workingCopyWarning = este reposit\u00f3rio tem uma working copy e n\u00e3o pode receber pushes
 gb.query = query
-gb.queryHelp = Standard query syntax é suportada.<p/><p/>Por favor veja ${querySyntax} para mais detalhes.
+gb.queryHelp = Standard query syntax \u00e9 suportada.<p/><p/>Por favor veja ${querySyntax} para mais detalhes.
 gb.querySyntax = Lucene Query Parser Syntax
 gb.queryResults = resultados {0} - {1} ({2} hits)
 gb.noHits = sem hits
 gb.authored = foi autor de
 gb.committed = committed
 gb.indexedBranches = branches indexados
-gb.indexedBranchesDescription = selecione os branches para incluir nos seus índices Lucene
-gb.noIndexedRepositoriesWarning = nenhum dos seus repositórios foram configurados para indexação do Lucene
-gb.undefinedQueryWarning = a query não foi definida!
-gb.noSelectedRepositoriesWarning = por favor selecione um ou mais repositórios!
-gb.luceneDisabled = indexação do Lucene está desabilitada
+gb.indexedBranchesDescription = selecione os branches para incluir nos seus \u00edndices Lucene
+gb.noIndexedRepositoriesWarning = nenhum dos seus reposit\u00f3rios foram configurados para indexa\u00e7\u00e3o do Lucene
+gb.undefinedQueryWarning = a query n\u00e3o foi definida!
+gb.noSelectedRepositoriesWarning = por favor selecione um ou mais reposit\u00f3rios!
+gb.luceneDisabled = indexa\u00e7\u00e3o do Lucene est\u00e1 desabilitada
 gb.failedtoRead = leitura falhou
-gb.isNotValidFile = não é um arquivo válido
+gb.isNotValidFile = n\u00e3o \u00e9 um arquivo v\u00e1lido
 gb.failedToReadMessage = falha ao ler mensagens default de {0}!
-gb.passwordsDoNotMatch = Passwords não conferem!
-gb.passwordTooShort = Password é muito curto. Tamanho mínimo são {0} caracteres.
+gb.passwordsDoNotMatch = Passwords n\u00e3o conferem!
+gb.passwordTooShort = Password \u00e9 muito curto. Tamanho m\u00ednimo s\u00e3o {0} caracteres.
 gb.passwordChanged = Password alterado com sucesso.
-gb.passwordChangeAborted = alteração do password foi abortada.
-gb.pleaseSetRepositoryName = Por favor ajuste o nome do repositório!
-gb.illegalLeadingSlash = Referências a diretórios raiz começando com (/) são proibidas.
-gb.illegalRelativeSlash = Referências a diretórios relativos (../) são proibidas.
-gb.illegalCharacterRepositoryName = Caractere ilegal ''{0}'' no nome do repositório!
-gb.selectAccessRestriction = Por favor selecione a restrição de acesso!
-gb.selectFederationStrategy = Por favor selecione a estratégia de federação!
+gb.passwordChangeAborted = altera\u00e7\u00e3o do password foi abortada.
+gb.pleaseSetRepositoryName = Por favor ajuste o nome do reposit\u00f3rio!
+gb.illegalLeadingSlash = Refer\u00eancias a diret\u00f3rios raiz come\u00e7ando com (/) s\u00e3o proibidas.
+gb.illegalRelativeSlash = Refer\u00eancias a diret\u00f3rios relativos (../) s\u00e3o proibidas.
+gb.illegalCharacterRepositoryName = Caractere ilegal ''{0}'' no nome do reposit\u00f3rio!
+gb.selectAccessRestriction = Por favor selecione a restri\u00e7\u00e3o de acesso!
+gb.selectFederationStrategy = Por favor selecione a estrat\u00e9gia de federa\u00e7\u00e3o!
 gb.pleaseSetTeamName = Por favor insira um nome de equipe!
-gb.teamNameUnavailable = O nome de equipe ''{0}'' está indisponível.
-gb.teamMustSpecifyRepository = Uma equipe deve especificar pelo menos um repositório.
+gb.teamNameUnavailable = O nome de equipe ''{0}'' est\u00e1 indispon\u00edvel.
+gb.teamMustSpecifyRepository = Uma equipe deve especificar pelo menos um reposit\u00f3rio.
 gb.teamCreated = Nova equipe ''{0}'' criada com sucesso.
 gb.pleaseSetUsername = Por favor entre com um username!
-gb.usernameUnavailable = Username ''{0}'' está indisponível.
-gb.combinedMd5Rename = Gitblit está configurado para usar um hash combinado-md5. Você deve inserir um novo password ao renamear a conta.
-gb.userCreated = Novo usuário ''{0}'' criado com sucesso.
-gb.couldNotFindFederationRegistration = Não foi possível localizar o registro da federação!
+gb.usernameUnavailable = Username ''{0}'' est\u00e1 indispon\u00edvel.
+gb.combinedMd5Rename = Gitblit est\u00e1 configurado para usar um hash combinado-md5. Voc\u00ea deve inserir um novo password ao renamear a conta.
+gb.userCreated = Novo usu\u00e1rio ''{0}'' criado com sucesso.
+gb.couldNotFindFederationRegistration = N\u00e3o foi poss\u00edvel localizar o registro da federa\u00e7\u00e3o!
 gb.failedToFindGravatarProfile = Falha ao localizar um perfil Gravatar para {0}
 gb.branchStats = {0} commits e {1} tags em {2}
-gb.repositoryNotSpecified = Repositório não específicado!
-gb.repositoryNotSpecifiedFor = Repositório não específicado para {0}!
-gb.canNotLoadRepository = Não foi possível carregar o repositório
-gb.commitIsNull = Commit está nulo
-gb.unauthorizedAccessForRepository = Acesso não autorizado para o repositório
-gb.failedToFindCommit = Não foi possível achar o commit \"{0}\" em {1} para {2} página!
-gb.couldNotFindFederationProposal = Não foi possível localizar propostas de federação!
-gb.invalidUsernameOrPassword = username ou password inválido!
-gb.OneProposalToReview = Existe uma proposta de federação aguardando revisão. 
-gb.nFederationProposalsToReview = Existem {0} propostas de federação aguardando revisão.
-gb.couldNotFindTag = Não foi possível localizar a tag {0}
-gb.couldNotCreateFederationProposal = Não foi possível criar uma proposta de federation!
+gb.repositoryNotSpecified = Reposit\u00f3rio n\u00e3o espec\u00edficado!
+gb.repositoryNotSpecifiedFor = Reposit\u00f3rio n\u00e3o espec\u00edficado para {0}!
+gb.canNotLoadRepository = N\u00e3o foi poss\u00edvel carregar o reposit\u00f3rio
+gb.commitIsNull = Commit est\u00e1 nulo
+gb.unauthorizedAccessForRepository = Acesso n\u00e3o autorizado para o reposit\u00f3rio
+gb.failedToFindCommit = N\u00e3o foi poss\u00edvel achar o commit \"{0}\" em {1} para {2} p\u00e1gina!
+gb.couldNotFindFederationProposal = N\u00e3o foi poss\u00edvel localizar propostas de federa\u00e7\u00e3o!
+gb.invalidUsernameOrPassword = username ou password inv\u00e1lido!
+gb.OneProposalToReview = Existe uma proposta de federa\u00e7\u00e3o aguardando revis\u00e3o.
+gb.nFederationProposalsToReview = Existem {0} propostas de federa\u00e7\u00e3o aguardando revis\u00e3o.
+gb.couldNotFindTag = N\u00e3o foi poss\u00edvel localizar a tag {0}
+gb.couldNotCreateFederationProposal = N\u00e3o foi poss\u00edvel criar uma proposta de federation!
 gb.pleaseSetGitblitUrl = Por favor insira sua url do Gitblit!
 gb.pleaseSetDestinationUrl = Por favor insira a url de destino para sua proposta!
 gb.proposalReceived = Proposta recebida com sucesso por {0}.
-gb.noGitblitFound = Desculpe, {0} não localizou uma instância do Gitblit em {1}.
-gb.noProposals = Desculpe, {0} não está aceitando propostas agora.
-gb.noFederation = Desculpe, {0} não está configurado com nenhuma intância do Gitblit.
-gb.proposalFailed = Desculpe, {0} não recebeu nenhum dado de proposta!
+gb.noGitblitFound = Desculpe, {0} n\u00e3o localizou uma inst\u00e2ncia do Gitblit em {1}.
+gb.noProposals = Desculpe, {0} n\u00e3o est\u00e1 aceitando propostas agora.
+gb.noFederation = Desculpe, {0} n\u00e3o est\u00e1 configurado com nenhuma int\u00e2ncia do Gitblit.
+gb.proposalFailed = Desculpe, {0} n\u00e3o recebeu nenhum dado de proposta!
 gb.proposalError = Desculpe, {0} reportou que um erro inesperado ocorreu!
-gb.failedToSendProposal = Não foi possível enviar a proposta!
-gb.userServiceDoesNotPermitAddUser = {0} não permite adicionar uma conta de usuário!
-gb.userServiceDoesNotPermitPasswordChanges = {0} não permite alterações no password!
+gb.failedToSendProposal = N\u00e3o foi poss\u00edvel enviar a proposta!
+gb.userServiceDoesNotPermitAddUser = {0} n\u00e3o permite adicionar uma conta de usu\u00e1rio!
+gb.userServiceDoesNotPermitPasswordChanges = {0} n\u00e3o permite altera\u00e7\u00f5es no password!
 gb.displayName = nome
 gb.emailAddress = e-mail
-gb.errorAdminLoginRequired = Administração requer um login
-gb.errorOnlyAdminMayCreateRepository = Somente umadministrador pode criar um repositório
-gb.errorOnlyAdminOrOwnerMayEditRepository = Somente umadministrador pode editar um repositório
-gb.errorAdministrationDisabled = Administração está desabilitada
-gb.lastNDays = últimos {0} dias
+gb.errorAdminLoginRequired = Administra\u00e7\u00e3o requer um login
+gb.errorOnlyAdminMayCreateRepository = Somente umadministrador pode criar um reposit\u00f3rio
+gb.errorOnlyAdminOrOwnerMayEditRepository = Somente umadministrador pode editar um reposit\u00f3rio
+gb.errorAdministrationDisabled = Administra\u00e7\u00e3o est\u00e1 desabilitada
+gb.lastNDays = \u00faltimos {0} dias
 gb.completeGravatarProfile = Profile completo em Gravatar.com
 gb.none = nenhum
 gb.line = linha
-gb.content = conteúdo
+gb.content = conte\u00fado
 gb.empty = vazio
 gb.inherited = herdado
-gb.deleteRepository = Deletar repositório \"{0}\"?
-gb.repositoryDeleted = Repositório ''{0}'' deletado.
-gb.repositoryDeleteFailed = Não foi possível apagar o repositório ''{0}''!
-gb.deleteUser = Deletar usuário \"{0}\"?
-gb.userDeleted = Usuário ''{0}'' deletado.
-gb.userDeleteFailed = Não foi possível apagar o usuário ''{0}''!
+gb.deleteRepository = Deletar reposit\u00f3rio \"{0}\"?
+gb.repositoryDeleted = Reposit\u00f3rio ''{0}'' deletado.
+gb.repositoryDeleteFailed = N\u00e3o foi poss\u00edvel apagar o reposit\u00f3rio ''{0}''!
+gb.deleteUser = Deletar usu\u00e1rio \"{0}\"?
+gb.userDeleted = Usu\u00e1rio ''{0}'' deletado.
+gb.userDeleteFailed = N\u00e3o foi poss\u00edvel apagar o usu\u00e1rio ''{0}''!
 gb.time.justNow = agora mesmo
 gb.time.today = hoje
 gb.time.yesterday = ontem
-gb.time.minsAgo = há {0} minutos
-gb.time.hoursAgo = há {0} horas
-gb.time.daysAgo = há {0} dias
-gb.time.weeksAgo = há {0} semanas
-gb.time.monthsAgo = há {0} meses
-gb.time.oneYearAgo = há 1 ano
-gb.time.yearsAgo = há {0} anos 
+gb.time.minsAgo = h\u00e1 {0} minutos
+gb.time.hoursAgo = h\u00e1 {0} horas
+gb.time.daysAgo = h\u00e1 {0} dias
+gb.time.weeksAgo = h\u00e1 {0} semanas
+gb.time.monthsAgo = h\u00e1 {0} meses
+gb.time.oneYearAgo = h\u00e1 1 ano
+gb.time.yearsAgo = h\u00e1 {0} anos
 gb.duration.oneDay = 1 dia
 gb.duration.days = {0} dias
-gb.duration.oneMonth = 1 mês
+gb.duration.oneMonth = 1 m\u00eas
 gb.duration.months = {0} meses
 gb.duration.oneYear = 1 ano
 gb.duration.years = {0} anos
-gb.authorizationControl = controle de autorização
-gb.allowAuthenticatedDescription = conceder permissão RW+ para todos os usuários autênticados
-gb.allowNamedDescription = conceder permissões refinadas para usuários escolhidos ou equipes
-gb.markdownFailure = Não foi possível converter conteúdo Markdown!
+gb.authorizationControl = controle de autoriza\u00e7\u00e3o
+gb.allowAuthenticatedDescription = conceder permiss\u00e3o RW+ para todos os usu\u00e1rios aut\u00eanticados
+gb.allowNamedDescription = conceder permiss\u00f5es refinadas para usu\u00e1rios escolhidos ou equipes
+gb.markdownFailure = N\u00e3o foi poss\u00edvel converter conte\u00fado Markdown!
 gb.clearCache = limpar o cache
 gb.projects = projetos
 gb.project = projeto
@@ -324,32 +323,32 @@ gb.fork = fork
 gb.forks = forks
 gb.forkRepository = fork {0}?
 gb.repositoryForked = fork feito em {0}
-gb.repositoryForkFailed= não foi possível fazer fork
-gb.personalRepositories = repositórios pessoais
+gb.repositoryForkFailed= n\u00e3o foi poss\u00edvel fazer fork
+gb.personalRepositories = reposit\u00f3rios pessoais
 gb.allowForks = permitir forks
-gb.allowForksDescription = permitir usuários autorizados a fazer fork deste repositório
+gb.allowForksDescription = permitir usu\u00e1rios autorizados a fazer fork deste reposit\u00f3rio
 gb.forkedFrom = forked de
 gb.canFork = pode fazer fork
-gb.canForkDescription = pode fazer fork de repositórios autorizados para repositórios pessoais
+gb.canForkDescription = pode fazer fork de reposit\u00f3rios autorizados para reposit\u00f3rios pessoais
 gb.myFork = visualizar meu fork
 gb.forksProhibited = forks proibidos
-gb.forksProhibitedWarning = este repositório proíbe forks
-gb.noForks = {0} não possui forks
-gb.forkNotAuthorized = desculpe, você não está autorizado a fazer fork de {0}
+gb.forksProhibitedWarning = este reposit\u00f3rio pro\u00edbe forks
+gb.noForks = {0} n\u00e3o possui forks
+gb.forkNotAuthorized = desculpe, voc\u00ea n\u00e3o est\u00e1 autorizado a fazer fork de {0}
 gb.forkInProgress = fork em progresso
 gb.preparingFork = preparando seu fork...
-gb.isFork = é fork
+gb.isFork = \u00e9 fork
 gb.canCreate = pode criar
-gb.canCreateDescription = pode criar repositórios pessoais
-gb.illegalPersonalRepositoryLocation = seu repositório pessoal deve estar localizado em \"{0}\"
+gb.canCreateDescription = pode criar reposit\u00f3rios pessoais
+gb.illegalPersonalRepositoryLocation = seu reposit\u00f3rio pessoal deve estar localizado em \"{0}\"
 gb.verifyCommitter = verificar committer
 gb.verifyCommitterDescription = requer a identidade do committer para combinar com uma conta do Gitblt
 gb.verifyCommitterNote = todos os merges requerem "--no-ff" para impor a identidade do committer
-gb.repositoryPermissions = permissões de repositório
-gb.userPermissions = permissões de usuário
-gb.teamPermissions = permissões de equipe
+gb.repositoryPermissions = permiss\u00f5es de reposit\u00f3rio
+gb.userPermissions = permiss\u00f5es de usu\u00e1rio
+gb.teamPermissions = permiss\u00f5es de equipe
 gb.add = add
-gb.noPermission = APAGAR ESTA PERMISSÃO
+gb.noPermission = APAGAR ESTA PERMISS\u00c3O
 gb.excludePermission = {0} (excluir)
 gb.viewPermission = {0} (visualizar)
 gb.clonePermission = {0} (clonar)
@@ -357,102 +356,102 @@ gb.pushPermission = {0} (push)
 gb.createPermission = {0} (push, ref creation)
 gb.deletePermission = {0} (push, ref creation+deletion)
 gb.rewindPermission = {0} (push, ref creation+deletion+rewind)
-gb.permission = permissão
-gb.regexPermission = esta permissão foi configurada através da expressão regular \"{0}\"
+gb.permission = permiss\u00e3o
+gb.regexPermission = esta permiss\u00e3o foi configurada atrav\u00e9s da express\u00e3o regular \"{0}\"
 gb.accessDenied = acesso negado
-gb.busyCollectingGarbage = desculpe, o Gitblit está ocupado coletando lixo em {0}
-gb.gcPeriod = período do GC
-gb.gcPeriodDescription = duração entre as coletas de lixo
-gb.gcThreshold = limite do GC 
-gb.gcThresholdDescription = tamanho total mínimo de objetos \"abandonados\" que ativam a coleta de lixo
-gb.ownerPermission = proprietário do repositório
+gb.busyCollectingGarbage = desculpe, o Gitblit est\u00e1 ocupado coletando lixo em {0}
+gb.gcPeriod = per\u00edodo do GC
+gb.gcPeriodDescription = dura\u00e7\u00e3o entre as coletas de lixo
+gb.gcThreshold = limite do GC
+gb.gcThresholdDescription = tamanho total m\u00ednimo de objetos \"abandonados\" que ativam a coleta de lixo
+gb.ownerPermission = propriet\u00e1rio do reposit\u00f3rio
 gb.administrator = administrador
 gb.administratorPermission = administrador do Gitblit
 gb.team = equipe
-gb.teamPermission = permissão concedida pela filiação a equipe \"{0}\"
+gb.teamPermission = permiss\u00e3o concedida pela filia\u00e7\u00e3o a equipe \"{0}\"
 gb.missing = faltando!
-gb.missingPermission = o repositório para esta permissão está faltando!
-gb.mutable = mutável
-gb.specified = específico
+gb.missingPermission = o reposit\u00f3rio para esta permiss\u00e3o est\u00e1 faltando!
+gb.mutable = mut\u00e1vel
+gb.specified = espec\u00edfico
 gb.effective = efetivo
 gb.organizationalUnit = unidade organizacional
-gb.organization = organização
+gb.organization = organiza\u00e7\u00e3o
 gb.locality = localidade
-gb.stateProvince = estado ou província
-gb.countryCode = código do país
+gb.stateProvince = estado ou prov\u00edncia
+gb.countryCode = c\u00f3digo do pa\u00eds
 gb.properties = propriedades
 gb.issued = emitido
 gb.expires = expira
 gb.expired = expirado
 gb.expiring = expirando
 gb.revoked = revogado
-gb.serialNumber = número serial
+gb.serialNumber = n\u00famero serial
 gb.certificates = certificados
 gb.newCertificate = novo certificado
 gb.revokeCertificate = revogar certificado
 gb.sendEmail = enviar email
 gb.passwordHint = dica de password
 gb.ok = ok
-gb.invalidExpirationDate = data de expiração inválida!
+gb.invalidExpirationDate = data de expira\u00e7\u00e3o inv\u00e1lida!
 gb.passwordHintRequired = dica de password requerida!
 gb.viewCertificate = visualizar certificado
 gb.subject = assunto
 gb.issuer = emissor
-gb.validFrom = válido a partir de
-gb.validUntil = válido até
-gb.publicKey = chave pública
+gb.validFrom = v\u00e1lido a partir de
+gb.validUntil = v\u00e1lido at\u00e9
+gb.publicKey = chave p\u00fablica
 gb.signatureAlgorithm = algoritmo de assinatura
-gb.sha1FingerPrint = digital SHA-1 
+gb.sha1FingerPrint = digital SHA-1
 gb.md5FingerPrint = digital MD5
-gb.reason = razão
-gb.revokeCertificateReason = Por selecione a razão da revogação do certificado
-gb.unspecified = não específico
+gb.reason = raz\u00e3o
+gb.revokeCertificateReason = Por selecione a raz\u00e3o da revoga\u00e7\u00e3o do certificado
+gb.unspecified = n\u00e3o espec\u00edfico
 gb.keyCompromise = comprometimento de chave
 gb.caCompromise = compromisso CA
-gb.affiliationChanged = afiliação foi alterada
-gb.superseded = substituídas
-gb.cessationOfOperation = cessação de funcionamento
-gb.privilegeWithdrawn = privilégio retirado
+gb.affiliationChanged = afilia\u00e7\u00e3o foi alterada
+gb.superseded = substitu\u00eddas
+gb.cessationOfOperation = cessa\u00e7\u00e3o de funcionamento
+gb.privilegeWithdrawn = privil\u00e9gio retirado
 gb.time.inMinutes = em {0} minutos
 gb.time.inHours = em {0} horas
 gb.time.inDays = em {0} dias
 gb.hostname = hostname
 gb.hostnameRequired = Por favor insira um hostname
 gb.newSSLCertificate = novo servidor de certificado SSL
-gb.newCertificateDefaults = novos padrões de certificação
-gb.duration = duração
-gb.certificateRevoked = Certificado {0, número, 0} foi revogado
+gb.newCertificateDefaults = novos padr\u00f5es de certifica\u00e7\u00e3o
+gb.duration = dura\u00e7\u00e3o
+gb.certificateRevoked = Certificado {0, n\u00famero, 0} foi revogado
 gb.clientCertificateGenerated = Novo certificado cliente para {0} foi gerado com sucesso
 gb.sslCertificateGenerated = Novo servidor de certificado SSL gerado com sucesso para {0}
-gb.newClientCertificateMessage = OBSERVAÇÃO:\nO 'password' não é o password do usuário mas sim o password usado para proteger a keystore.  Este password não será salvo então você também inserir uma dica que será incluída nas instruções de LEIA-ME do usuário.
+gb.newClientCertificateMessage = OBSERVA\u00c7\u00c3O:\nO 'password' n\u00e3o \u00e9 o password do usu\u00e1rio mas sim o password usado para proteger a keystore.  Este password n\u00e3o ser\u00e1 salvo ent\u00e3o voc\u00ea tamb\u00e9m inserir uma dica que ser\u00e1 inclu\u00edda nas instru\u00e7\u00f5es de LEIA-ME do usu\u00e1rio.
 gb.certificate = certificado
 gb.emailCertificateBundle = pacote certificado de cliente de email
 gb.pleaseGenerateClientCertificate = Por favor gere um certificado cliente para {0}
 gb.clientCertificateBundleSent = Pacote de certificado de cliente para {0} enviada
 gb.enterKeystorePassword = Por favor insira uma chave para keystore do Gitblit
 gb.warning = warning
-gb.jceWarning = Seu Java Runtime Environment não tem os arquivos \"JCE Unlimited Strength Jurisdiction Policy\".\nIsto irá limitar o tamanho dos passwords que você usará para encriptar suas keystores para 7 caracteres.\nEstes arquivos de políticas são um download opcional da Oracle.\n\nVocê gostaria de continuar e gerar os certificados de infraestrutura de qualquer forma?\n\nRespondendo "Não" irá redirecionar o seu browser para a página de downloads da Oracle, de onde você poderá fazer download desses arquivos.
-gb.maxActivityCommits = limitar exibição de commits
-gb.maxActivityCommitsDescription = quantidade máxima de commits para contribuir para a página de atividade
+gb.jceWarning = Seu Java Runtime Environment n\u00e3o tem os arquivos \"JCE Unlimited Strength Jurisdiction Policy\".\nIsto ir\u00e1 limitar o tamanho dos passwords que voc\u00ea usar\u00e1 para encriptar suas keystores para 7 caracteres.\nEstes arquivos de pol\u00edticas s\u00e3o um download opcional da Oracle.\n\nVoc\u00ea gostaria de continuar e gerar os certificados de infraestrutura de qualquer forma?\n\nRespondendo "N\u00e3o" ir\u00e1 redirecionar o seu browser para a p\u00e1gina de downloads da Oracle, de onde voc\u00ea poder\u00e1 fazer download desses arquivos.
+gb.maxActivityCommits = limitar exibi\u00e7\u00e3o de commits
+gb.maxActivityCommitsDescription = quantidade m\u00e1xima de commits para contribuir para a p\u00e1gina de atividade
 gb.noMaximum = ilimitado
 gb.attributes = atributos
 gb.serveCertificate = servir https com este certificado
-gb.sslCertificateGeneratedRestart = Novo certificado SSL de servidor gerado com sucesso para {0}.\nVocê deve reiniciar o Gitblit para usar o novo certificado.\n\nSe você estiver executando com o parâmetro '--alias', você precisará alterá-lo para ''--alias {0}''.
+gb.sslCertificateGeneratedRestart = Novo certificado SSL de servidor gerado com sucesso para {0}.\nVoc\u00ea deve reiniciar o Gitblit para usar o novo certificado.\n\nSe voc\u00ea estiver executando com o par\u00e2metro '--alias', voc\u00ea precisar\u00e1 alter\u00e1-lo para ''--alias {0}''.
 gb.validity = validade
 gb.siteName = nome do site
 gb.siteNameDescription = breve, mas ainda assim um nome descritivo para seu servidor
-gb.excludeFromActivity = excluir da página de atividades
-gb.isSparkleshared = repositório é Sparkleshared
-gb.owners = proprietários
-gb.sessionEnded = A Sessão foi encerrada
-gb.closeBrowser = Por favor feche a tela do browser para encerrar a sessão apropriadamente.
-gb.doesNotExistInTree = {0} não existe na árvore {1}
+gb.excludeFromActivity = excluir da p\u00e1gina de atividades
+gb.isSparkleshared = reposit\u00f3rio \u00e9 Sparkleshared
+gb.owners = propriet\u00e1rios
+gb.sessionEnded = A Sess\u00e3o foi encerrada
+gb.closeBrowser = Por favor feche a tela do browser para encerrar a sess\u00e3o apropriadamente.
+gb.doesNotExistInTree = {0} n\u00e3o existe na \u00e1rvore {1}
 gb.enableIncrementalPushTags = ativar push tags incrementais
-gb.useIncrementalPushTagsDescription = quando fizer push, automaticamente taguear cada branch com um número de revisão incremental
-gb.incrementalPushTagMessage = [{0}] branch foi tagueado automáticamente depois do push
-gb.externalPermissions = {0} permissões de acesso são externalizadas
-gb.viewAccess = Você não tem permissão para ler ou escrever o Gitblit
-gb.overview = visão geral
+gb.useIncrementalPushTagsDescription = quando fizer push, automaticamente taguear cada branch com um n\u00famero de revis\u00e3o incremental
+gb.incrementalPushTagMessage = [{0}] branch foi tagueado autom\u00e1ticamente depois do push
+gb.externalPermissions = {0} permiss\u00f5es de acesso s\u00e3o externalizadas
+gb.viewAccess = Voc\u00ea n\u00e3o tem permiss\u00e3o para ler ou escrever o Gitblit
+gb.overview = vis\u00e3o geral
 gb.dashboard = dashboard
 gb.monthlyActivity = atividade mensal
 gb.myProfile = meu perfil
@@ -463,14 +462,14 @@ gb.to = para
 gb.at = em
 gb.of = de
 gb.in = em
-gb.moreChanges = todas mudanças...
+gb.moreChanges = todas mudan\u00e7as...
 gb.pushedNCommitsTo = fez push de {0} commits para
 gb.pushedOneCommitTo = fez push de 1 commit para
 gb.commitsTo = {0} commits para
 gb.oneCommitTo = 1 commit para
 gb.byNAuthors = por {0} autores
 gb.byOneAuthor = por {0}
-gb.viewComparison = veja uma comparação desses {0} commits \u00bb
+gb.viewComparison = veja uma compara\u00e7\u00e3o desses {0} commits \u00bb
 gb.nMoreCommits = {0} mais commits \u00bb
 gb.oneMoreCommit = mais 1 commit \u00bb
 gb.pushedNewTag = fez push de uma nova tag
@@ -479,20 +478,20 @@ gb.deletedTag = tag deletada
 gb.pushedNewBranch = fez push de um novo branch
 gb.createdNewBranch = um novo branch foi criado
 gb.deletedBranch = branch deletado
-gb.createdNewPullRequest = requisições de pull foram criadas
+gb.createdNewPullRequest = requisi\u00e7\u00f5es de pull foram criadas
 gb.mergedPullRequest = pull request mergeado
 gb.rewind = REBOBINAR
 gb.star = favoritar
 gb.unstar = desfavoritar
 gb.stargazers = favoritos
-gb.starredRepositories = repositóries favoritos
-gb.failedToUpdateUser = Falha ao atualizar a conta de usuário!
-gb.myRepositories = meus repositórios
-gb.noActivity = não houve atividade no últimos {0} dias
-gb.findSomeRepositories = localizar alguns repositórios
-gb.metricAuthorExclusions = exclusões de métricas de autor
+gb.starredRepositories = reposit\u00f3ries favoritos
+gb.failedToUpdateUser = Falha ao atualizar a conta de usu\u00e1rio!
+gb.myRepositories = meus reposit\u00f3rios
+gb.noActivity = n\u00e3o houve atividade no \u00faltimos {0} dias
+gb.findSomeRepositories = localizar alguns reposit\u00f3rios
+gb.metricAuthorExclusions = exclus\u00f5es de m\u00e9tricas de autor
 gb.myDashboard = meu dashboard
-gb.failedToFindAccount = falha ao localizar a conta do usuário ''{0}''
+gb.failedToFindAccount = falha ao localizar a conta do usu\u00e1rio ''{0}''
 gb.reflog = reflog
 gb.active = ativo
 gb.starred = favoritado
@@ -501,9 +500,8 @@ gb.starredAndOwned = favoritado & apropriado
 gb.reviewPatchset = rever {0} patchset {1}
 gb.todaysActivityStats = hoje / {1} commits por {2} autores
 gb.todaysActivityNone = hoje / nenhum
-gb.noActivityToday = não houve atividade hoje
-gb.anonymousUser= anônimo
+gb.noActivityToday = n\u00e3o houve atividade hoje
+gb.anonymousUser= an\u00f4nimo
 
 # This last property for unit tests to test successful loading of the resource file
 gb.loadLang = Portugu\u00eas
-
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
index 5f5b9a947..67c103c81 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
@@ -18,7 +18,6 @@ gb.object = \u5bf9\u8c61
 gb.ticketId = \u95ee\u9898\u7f16\u53f7
 gb.ticketAssigned = \u5206\u914d\u60c5\u51b5
 gb.ticketOpenDate = \u5f00\u542f\u65e5\u671f
-gb.ticketState = \u72b6\u6001
 gb.ticketComments = \u8bc4\u8bba
 gb.view = \u67e5\u770b
 gb.local = \u672c\u5730
@@ -93,7 +92,7 @@ gb.isFrozen = \u88ab\u51bb\u7ed3
 gb.isFrozenDescription = \u7981\u6b62\u63a8\u9001\u64cd\u4f5c
 gb.zip = zip
 gb.showReadme = \u663e\u793areadme\u6587\u4ef6
-gb.showReadmeDescription = \u5728\u6982\u51b5\u9875\u9762\u663e\u793a \\"readme\\" Markdown \u6587\u4ef6
+gb.showReadmeDescription = \u5728\u6982\u51b5\u9875\u9762\u663e\u793a \"readme\" Markdown \u6587\u4ef6
 gb.nameDescription = \u4f7f\u7528 '/' \u5bf9\u7248\u672c\u5e93\u8fdb\u884c\u5206\u7ec4  \u4f8b\u5982\uff1a libraries/mycoollib.git
 gb.ownerDescription = \u6240\u6709\u8005\u53ef\u4ee5\u7f16\u8f91\u7248\u672c\u5e93\u5c5e\u6027
 gb.blob = blob
@@ -239,7 +238,7 @@ gb.passwordChangeAborted = \u5bc6\u7801\u66f4\u6539\u5df2\u53d6\u6d88\u3002
 gb.pleaseSetRepositoryName = \u8bf7\u8bbe\u7f6e\u4e00\u4e2a\u7248\u672c\u5e93\u540d\u79f0
 gb.illegalLeadingSlash = \u7981\u6b62\u4f7f\u7528\u6839\u76ee\u5f55\u5f15\u7528 (/) \u3002
 gb.illegalRelativeSlash = \u76f8\u5bf9\u6587\u4ef6\u5939\u8def\u5f84(../)\u7981\u6b62\u4f7f\u7528
-gb.illegalCharacterRepositoryName = \u7248\u672c\u5e93\u4e2d\u542b\u6709\u4e0d\u5408\u6cd5\u5b57\u7b26 ''{0}'' 
+gb.illegalCharacterRepositoryName = \u7248\u672c\u5e93\u4e2d\u542b\u6709\u4e0d\u5408\u6cd5\u5b57\u7b26 ''{0}''
 gb.selectAccessRestriction = \u8bf7\u9009\u62e9\u8bbf\u95ee\u6743\u9650
 gb.selectFederationStrategy = \u8bf7\u9009\u62e9 federation \u7b56\u7565
 gb.pleaseSetTeamName = \u8bf7\u8f93\u5165\u4e00\u4e2a\u56e2\u961f\u540d\u79f0
@@ -249,7 +248,7 @@ gb.teamCreated = \u6210\u529f\u521b\u5efa\u65b0\u56e2\u961f ''{0}'' .
 gb.pleaseSetUsername = \u8bf7\u8f93\u5165\u7528\u6237\u540d
 gb.usernameUnavailable = \u7528\u6237\u540d ''{0}'' \u4e0d\u53ef\u7528
 gb.combinedMd5Rename = Gitblit \u91c7\u7528\u6df7\u5408 MD5 \u5bc6\u7801\u54c8\u5e0c\uff0c\u56e0\u6b64\u5fc5\u987b\u5728\u4fee\u6539\u7528\u6237\u540d\u540e\u4fee\u6539\u5bc6\u7801\u3002
-gb.userCreated = \u6210\u529f\u521b\u5efa\u65b0\u7528\u6237 \\"{0}\\"\u3002
+gb.userCreated = \u6210\u529f\u521b\u5efa\u65b0\u7528\u6237 \"{0}\"\u3002
 gb.couldNotFindFederationRegistration = \u65e0\u6cd5\u627e\u5230 federation registration
 gb.failedToFindGravatarProfile = \u52a0\u8f7d {0} \u7684 Gravatar \u4fe1\u606f\u5931\u8d25
 gb.branchStats = {0} \u4e2a\u63d0\u4ea4\u548c {1} \u4e2a\u6807\u7b7e\u5728 {2} \u5185
@@ -258,7 +257,7 @@ gb.repositoryNotSpecifiedFor = \u6ca1\u6709\u4e3a {0} \u8bbe\u7f6e\u7248\u672c\u
 gb.canNotLoadRepository = \u65e0\u6cd5\u8f7d\u5165\u7248\u672c\u5e93
 gb.commitIsNull = \u63d0\u4ea4\u5185\u5bb9\u4e3a\u7a7a
 gb.unauthorizedAccessForRepository = \u672a\u6388\u6743\u8bbf\u95ee\u7248\u672c\u5e93
-gb.failedToFindCommit = \u5728 {1} \u4e2d {2} \u4e2a\u9875\u9762\u5185\u67e5\u627e\u63d0\u4ea4 \\"{0}\\"\u5931\u8d25
+gb.failedToFindCommit = \u5728 {1} \u4e2d {2} \u4e2a\u9875\u9762\u5185\u67e5\u627e\u63d0\u4ea4 \"{0}\"\u5931\u8d25
 gb.couldNotFindFederationProposal = \u65e0\u6cd5\u627e\u5230 federation proposal
 gb.invalidUsernameOrPassword = \u7528\u6237\u540d\u6216\u8005\u5bc6\u7801\u9519\u8bef
 gb.OneProposalToReview = 1\u4e2a federation proposal \u9700\u8981\u5ba1\u67e5
@@ -289,10 +288,10 @@ gb.line = \u884c
 gb.content = \u5185\u5bb9
 gb.empty = \u7a7a\u7248\u672c\u5e93
 gb.inherited = \u7ee7\u627f
-gb.deleteRepository = \u5220\u9664\u7248\u672c\u5e93 \\"{0}\\" \uff1f
+gb.deleteRepository = \u5220\u9664\u7248\u672c\u5e93 \"{0}\" \uff1f
 gb.repositoryDeleted = \u7248\u672c\u5e93 ''{0}'' \u5df2\u5220\u9664\u3002
-gb.repositoryDeleteFailed = \u5220\u9664\u7248\u672c\u5e93 \\"{0}\\" \u5931\u8d25\u3002
-gb.deleteUser = \u5220\u9664\u7528\u6237 \\"{0}\\" \uff1f
+gb.repositoryDeleteFailed = \u5220\u9664\u7248\u672c\u5e93 \"{0}\" \u5931\u8d25\u3002
+gb.deleteUser = \u5220\u9664\u7528\u6237 \"{0}\" \uff1f
 gb.userDeleted = \u7528\u6237 ''{0}'' \u5df2\u5220\u9664\u3002
 gb.userDeleteFailed = \u5220\u9664\u7528\u6237''{0}''\u5931\u8d25\u3002
 gb.time.justNow = \u521a\u521a
@@ -341,10 +340,10 @@ gb.preparingFork = \u6b63\u5728\u4e3a\u60a8\u51c6\u5907\u5206\u652f...
 gb.isFork = \u5df2\u5efa\u7acb\u5206\u652f
 gb.canCreate = \u5141\u8bb8\u521b\u5efa
 gb.canCreateDescription = \u5141\u8bb8\u521b\u5efa\u79c1\u6709\u7248\u672c\u5e93
-gb.illegalPersonalRepositoryLocation = \u60a8\u7684\u79c1\u6709\u7248\u672c\u5e93\u5fc5\u987b\u4f4d\u4e8e \\"{0}\\"
+gb.illegalPersonalRepositoryLocation = \u60a8\u7684\u79c1\u6709\u7248\u672c\u5e93\u5fc5\u987b\u4f4d\u4e8e \"{0}\"
 gb.verifyCommitter = \u9a8c\u8bc1\u63d0\u4ea4\u8005
 gb.verifyCommitterDescription = \u9700\u8981\u63d0\u4ea4\u8005\u7684\u8eab\u4efd\u4e0e Gitblit \u7528\u6237\u8eab\u4efd\u76f8\u7b26
-gb.verifyCommitterNote = \u6240\u6709\u5408\u5e76\u9009\u9879\u9700\u8981\u4f7f\u7528 \\"--no-ff\\" \u6765\u6267\u884c\u63d0\u4ea4\u8005\u9a8c\u8bc1
+gb.verifyCommitterNote = \u6240\u6709\u5408\u5e76\u9009\u9879\u9700\u8981\u4f7f\u7528 \"--no-ff\" \u6765\u6267\u884c\u63d0\u4ea4\u8005\u9a8c\u8bc1
 gb.repositoryPermissions = \u7248\u672c\u5e93\u6743\u9650
 gb.userPermissions = \u7528\u6237\u6743\u9650
 gb.teamPermissions = \u56e2\u961f\u6743\u9650
@@ -357,7 +356,7 @@ gb.pushPermission = {0}\uff08\u63a8\u9001\uff09
 gb.createPermission = {0}\uff08\u63a8\u9001, \u521b\u5efa\uff0c\u5f15\u7528\uff09
 gb.deletePermission = {0}\uff08\u63a8\u9001, \u521b\u5efa\uff0c\u5220\u9664\uff0c\u5f15\u7528\uff09
 gb.rewindPermission = {0}\uff08\u63a8\u9001, \u521b\u5efa\uff0c\u5220\u9664\uff0c\u56de\u9000\uff09
-gb.regexPermission = \u6b64\u6743\u9650\u662f\u901a\u8fc7\u6b63\u5219\u8868\u8fbe\u5f0f \\"{0}\\" \u8bbe\u7f6e
+gb.regexPermission = \u6b64\u6743\u9650\u662f\u901a\u8fc7\u6b63\u5219\u8868\u8fbe\u5f0f \"{0}\" \u8bbe\u7f6e
 gb.accessDenied = \u8bbf\u95ee\u88ab\u62d2\u7edd
 gb.busyCollectingGarbage = \u62b1\u6b49\uff0cGitblit\u6b63\u5728 {0} \u5185\u6e05\u7406\u5783\u573e
 gb.gcPeriod = \u5783\u573e\u6e05\u7406\u65f6\u95f4
@@ -368,7 +367,7 @@ gb.ownerPermission = \u7248\u672c\u5e93\u6240\u6709\u8005
 gb.administrator = \u7ba1\u7406\u5458
 gb.administratorPermission = Gitblit \u7ba1\u7406\u5458
 gb.team = \u56e2\u961f
-gb.teamPermission = \u901a\u8fc7 \\"{0}\\" \u56e2\u961f\u6210\u5458\u8bbe\u7f6e\u6743\u9650
+gb.teamPermission = \u901a\u8fc7 \"{0}\" \u56e2\u961f\u6210\u5458\u8bbe\u7f6e\u6743\u9650
 gb.missing = \u4e0d\u5b58\u5728
 gb.missingPermission = \u6b64\u6743\u9650\u65e0\u6cd5\u5bf9\u5e94\u5230\u7248\u672c\u5e93
 gb.mutable = \u53ef\u53d8\u7684
@@ -423,20 +422,20 @@ gb.duration = \u6301\u7eed\u65f6\u95f4
 gb.certificateRevoked = \u8bc1\u4e66 {0,number,0} \u5df2\u88ab\u64a4\u9500
 gb.clientCertificateGenerated = \u6210\u529f\u4e3a {0} \u751f\u6210\u65b0\u7684\u5ba2\u6237\u7aef\u8bc1\u4e66
 gb.sslCertificateGenerated = \u6210\u529f\u4e3a {0} \u751f\u6210\u65b0\u7684\u670d\u52a1\u5668 SSL \u8bc1\u4e66
-gb.newClientCertificateMessage = \u6ce8\u610f:\\n\u6b64\u5bc6\u7801\u5e76\u975e\u7528\u6237\u5bc6\u7801, \u8fd9\u662f\u4fdd\u5b58\u7528\u6237 keystore \u7684\u5bc6\u7801\u3002  \u7531\u4e8e\u672c\u5bc6\u7801\u672a\u5b58\u50a8\uff0c\u56e0\u6b64\u4f60\u5fc5\u987b\u4e00\u4e2a\u5bc6\u7801\u63d0\u793a\uff0c\u8fd9\u4e2a\u63d0\u793a\u4f1a\u8bb0\u5f55\u5728\u7528\u6237\u7684 README \u6587\u6863\u5185\u3002
+gb.newClientCertificateMessage = \u6ce8\u610f:\n\u6b64\u5bc6\u7801\u5e76\u975e\u7528\u6237\u5bc6\u7801, \u8fd9\u662f\u4fdd\u5b58\u7528\u6237 keystore \u7684\u5bc6\u7801\u3002  \u7531\u4e8e\u672c\u5bc6\u7801\u672a\u5b58\u50a8\uff0c\u56e0\u6b64\u4f60\u5fc5\u987b\u4e00\u4e2a\u5bc6\u7801\u63d0\u793a\uff0c\u8fd9\u4e2a\u63d0\u793a\u4f1a\u8bb0\u5f55\u5728\u7528\u6237\u7684 README \u6587\u6863\u5185\u3002
 gb.certificate = \u8bc1\u4e66
 gb.emailCertificateBundle = \u53d1\u9001\u5ba2\u6237\u7aef\u8bc1\u4e66
 gb.pleaseGenerateClientCertificate = \u8bf7\u4e3a {0} \u751f\u6210\u4e00\u4e2a\u5ba2\u6237\u7aef\u8bc1\u4e66
 gb.clientCertificateBundleSent = \u5df2\u53d1\u9001 {0} \u7684\u5ba2\u6237\u7aef\u8bc1\u4e66
 gb.enterKeystorePassword = \u8bf7\u8f93\u5165 Gitblit keystore \u5bc6\u7801
 gb.warning = \u8b66\u544a
-gb.jceWarning = \u60a8\u7684 JAVA \u8fd0\u884c\u73af\u5883\u4e0d\u5305\u542b \\"JCE Unlimited Strength Jurisdiction Policy\\" \u6587\u4ef6\u3002\\n\u8fd9\u5c06\u5bfc\u81f4\u60a8\u6700\u591a\u53ea\u80fd\u7528 7 \u4e2a\u5b57\u7b26\u7684\u5bc6\u7801\u4fdd\u62a4\u60a8\u7684 keystore\u3002 \\n\u8fd9\u4e9b\u662f\u4e00\u4e9b\u53ef\u9009\u4e0b\u8f7d\u7684\u6587\u4ef6\u3002\\n\\n\u4f60\u662f\u5426\u8981\u7ee7\u7eed\u751f\u6210\u8bc1\u4e66\uff1f\\n\\n\u9009\u62e9\u5426\u7684\u8bdd\uff0c\u5c06\u4f1a\u6253\u5f00\u4e00\u4e2a\u6d4f\u89c8\u5668\u9875\u9762\u4f9b\u60a8\u4e0b\u8f7d\u76f8\u5173\u6587\u4ef6\u3002
+gb.jceWarning = \u60a8\u7684 JAVA \u8fd0\u884c\u73af\u5883\u4e0d\u5305\u542b \"JCE Unlimited Strength Jurisdiction Policy\" \u6587\u4ef6\u3002\n\u8fd9\u5c06\u5bfc\u81f4\u60a8\u6700\u591a\u53ea\u80fd\u7528 7 \u4e2a\u5b57\u7b26\u7684\u5bc6\u7801\u4fdd\u62a4\u60a8\u7684 keystore\u3002 \n\u8fd9\u4e9b\u662f\u4e00\u4e9b\u53ef\u9009\u4e0b\u8f7d\u7684\u6587\u4ef6\u3002\n\n\u4f60\u662f\u5426\u8981\u7ee7\u7eed\u751f\u6210\u8bc1\u4e66\uff1f\n\n\u9009\u62e9\u5426\u7684\u8bdd\uff0c\u5c06\u4f1a\u6253\u5f00\u4e00\u4e2a\u6d4f\u89c8\u5668\u9875\u9762\u4f9b\u60a8\u4e0b\u8f7d\u76f8\u5173\u6587\u4ef6\u3002
 gb.maxActivityCommits = \u6700\u5927\u6d3b\u52a8\u63d0\u4ea4\u6570
 gb.maxActivityCommitsDescription = \u6d3b\u52a8\u9875\u9762\u663e\u793a\u7684\u6700\u5927\u63d0\u4ea4\u6570
 gb.noMaximum = \u65e0\u4e0a\u9650
 gb.attributes = \u5c5e\u6027
 gb.serveCertificate = \u4f7f\u7528\u6b64\u8bc1\u4e66\u63d0\u4f9b https \u652f\u6301
-gb.sslCertificateGeneratedRestart = \u6210\u529f\u4e3a {0} \u751f\u6210\u65b0\u7684 SSL \u8bc1\u4e66.\\n\u4f60\u5fc5\u987b\u91cd\u65b0\u542f\u52a8 Gitblit \u4ee5\u4f7f\u7528\u6b64\u8bc1\u4e66\u3002\\n\\n\u5982\u679c\u60a8\u4f7f\u7528 '--alias' \u53c2\u6570\u542f\u52a8\uff0c\u4f60\u5fc5\u987b\u4e5f\u8981\u8bbe\u7f6e ''--alias {0}''\u3002
+gb.sslCertificateGeneratedRestart = \u6210\u529f\u4e3a {0} \u751f\u6210\u65b0\u7684 SSL \u8bc1\u4e66.\n\u4f60\u5fc5\u987b\u91cd\u65b0\u542f\u52a8 Gitblit \u4ee5\u4f7f\u7528\u6b64\u8bc1\u4e66\u3002\n\n\u5982\u679c\u60a8\u4f7f\u7528 '--alias' \u53c2\u6570\u542f\u52a8\uff0c\u4f60\u5fc5\u987b\u4e5f\u8981\u8bbe\u7f6e ''--alias {0}''\u3002
 gb.validity = \u6709\u6548\u6027
 gb.siteName = \u7f51\u7ad9\u540d\u79f0
 gb.siteNameDescription = \u60a8\u7684\u670d\u52a1\u5668\u7684\u7b80\u8981\u63cf\u8ff0
@@ -675,7 +674,7 @@ gb.myTickets = \u6211\u7684\u4efb\u52a1
 gb.yourAssignedTickets = \u6307\u5b9a\u7ed9\u6211\u7684\u4efb\u52a1
 gb.newMilestone = \u521b\u5efa\u91cc\u7a0b\u7891
 gb.editMilestone = \u7f16\u8f91\u91cc\u7a0b\u7891
-gb.deleteMilestone = \u5220\u9664\u91cc\u7a0b\u7891 \\"{0}\\"?
+gb.deleteMilestone = \u5220\u9664\u91cc\u7a0b\u7891 \"{0}\"?
 gb.milestoneDeleteFailed = \u65e0\u6cd5\u5220\u9664\u91cc\u7a0b\u7891 ''{0}''
 gb.notifyChangedOpenTickets = \u5df2\u5f00\u542f\u4efb\u52a1\u53d8\u52a8\u901a\u77e5
 gb.overdue = \u8fc7\u671f
@@ -741,7 +740,6 @@ gb.sshKeyPermissionDescription = \u8bbe\u7f6e SSH \u5bc6\u94a5\u7684\u8bbf\u95ee
 gb.transportPreference = \u4f20\u8f93\u504f\u597d
 gb.transportPreferenceDescription = \u9009\u62e9\u60a8\u7528\u6765\u514b\u9686\u7684\u4f20\u8f93\u65b9\u5f0f
 gb.ticketStatus = \u72b6\u6001
-gb.oneAttachment  = {0} \u4e2a\u9644\u4ef6
 gb.maintenanceTickets = \u7ef4\u62a4
 gb.mergeType = \u5408\u5e76\u7c7b\u578b
 gb.mergeTypeDescription = \u4ec5\u5728\u5fc5\u8981\u65f6\u5feb\u901f\u5408\u5e76\u4efb\u52a1\uff0c\u6216\u8005\u603b\u662f\u4e0e\u5408\u5e76\u63d0\u4ea4\u5230\u96c6\u6210\u5206\u652f
@@ -783,7 +781,7 @@ gb.deletePatchsetSuccess = \u5df2\u5220\u9664\u8865\u4e01\u96c6 {0}\u3002
 gb.deletePatchsetFailure = \u5220\u9664\u8865\u4e01\u96c6 {0} \u65f6\u53d1\u751f\u9519\u8bef\u3002
 gb.referencedByCommit = \u88ab\u63d0\u4ea4\u5f15\u7528\u3002
 gb.referencedByTicket = \u88ab\u4efb\u52a1\u5f15\u7528\u3002
-gb.emailClientCertificateSubject = \u7528\u4e8e {0} \u7684 Gitblit \u5ba2\u6237\u7aef\u8bc1\u4e66 
+gb.emailClientCertificateSubject = \u7528\u4e8e {0} \u7684 Gitblit \u5ba2\u6237\u7aef\u8bc1\u4e66
 
 # This last property for unit tests to test successful loading of the resource file
 gb.loadLang = \u6c49\u5b57
diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_TW.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_TW.properties
index 910dea415..337a18d50 100644
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_TW.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_TW.properties
@@ -782,7 +782,7 @@ gb.deletePatchsetSuccess = \u5df2\u522a\u9664 Patchset {0}.
 gb.deletePatchsetFailure = \u522a\u9664 Patchset {0} \u932f\u8aa4.
 gb.referencedByCommit = Referenced by commit.
 gb.referencedByTicket = Referenced by ticket.
-gb.emailClientCertificateSubject = \u4F3A\u670D\u5668 {0} \u9023\u7DDA\u6191\u8B49 
+gb.emailClientCertificateSubject = \u4F3A\u670D\u5668 {0} \u9023\u7DDA\u6191\u8B49
 
 # This last property for unit tests to test successful loading of the resource file
 gb.loadLang = \u6f22\u5b57
diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
index 4b8787630..4ab2483a5 100644
--- a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
+++ b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
@@ -118,7 +118,7 @@ public void onClick(AjaxRequestTarget target) {
 
 		final IModel<String> keyComment = Model.of("");
 		addKeyForm.add(new TextOption("addKeyComment",
-				getString("gb.comment"),
+				getString("gb.sshKeyComment"),
 				getString("gb.sshKeyCommentDescription"),
 				"span5",
 				keyComment));