fix: Remove duplicate property keys from properties files

Some property keys were duplicated, mostly `status`, `permission` and
`comment`.
The problem with `gb.comment` is, that it is used in two different
locations in two different meanings. One as a verb, the second as a
noun. Which makes no difference in English, but other languages.
The solution is that the second key is renamed to `gb.sshKeyComment`.
The code is adjusted accordingly.

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp.properties
index f6354ed89dd61232dcdfb7997a5ceec3760116d1..23006c0ea65feb046a6783e4ff1df4e2808b2e9e 100644 (file)
--- 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}
@@ -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 a7a5277f801e0712cb2c1b04d46a0784dd58c68b..51bfa437d564d2a8c84896aefcbb37d5f45df6b1 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_cs.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_cs.properties
@@ -426,6 +426,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

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
index 519515295e75f8571ea1300fd79238a2c3e2d162..c101907c4180b5c3c121bc437d628d0064e502ec 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_de.properties
@@ -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
@@ -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 2569cc674bc2bbcce30ed8ea7d89dfb8524cbc76..8b40b55e1e140b2f02596cf3d502b9dcc6bb2427 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_es.properties
@@ -170,7 +170,6 @@ gb.accessLevel = Nivel de acceso
 gb.default = Predeterminado\r
 gb.setDefault = Poner predeterminado\r
 gb.since = Desde\r
-gb.status = Estado\r
 gb.bootDate = Fecha de inicio\r
 gb.servletContainer = Contenedor ServLet\r
 gb.heapMaximum = Pila m\u00E1xima\r
@@ -671,6 +670,7 @@ gb.repositoryDoesNotAcceptPatchsets = Este Repositorio no acepta parches.
 gb.serverDoesNotAcceptPatchsets = Este Servidor-Git no acepta parches.\r
 gb.ticketIsClosed = Este ticket est\u00E1 cerrado.\r
 gb.mergeToDescription = Rama de integraciu00F3n predeterminada para combinar ticket y parches\r
+gb.sshKeyComment = Comentar\r
 \r
 # This last property for unit tests to test successful loading of the resource file\r
 gb.loadLang = Espa\u00f1ol\r

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
index 8b765fd2bfeeb67c8265903a5baaa1725b2e55e4..30d8c2a92f13f0917ab53e45b1af438a4e854512 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_fr.properties
@@ -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
@@ -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 cc5a2cd80d3021b2d07f0b6a3b2c26d5246c8eaf..dd9e53065dafcf9606297a8a3c52e4dca65e9d06 100644 (file)
--- 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
@@ -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 add25403dd5d53bfd314f0acb7af865740bc9565..8991bbca66afc56ad83a5af0e2b600dd7a763499 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ja.properties
@@ -169,7 +169,6 @@ gb.accessLevel = \u30a2\u30af\u30bb\u30b9\u30ec\u30d9\u30eb
 gb.default = \u30c7\u30d5\u30a9\u30eb\u30c8\r
 gb.setDefault = \u30c7\u30d5\u30a9\u30eb\u30c8\u306b\u8a2d\u5b9a\r
 gb.since = since\r
-gb.status = status\r
 gb.bootDate = boot date\r
 gb.servletContainer = \u30b5\u30fc\u30d6\u30ec\u30c3\u30c8\u30b3\u30f3\u30c6\u30ca\r
 gb.heapMaximum = \u6700\u5927\u30d2\u30fc\u30d7\r

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
index 23ab11870df795bb96a824c13368c215807c62fe..57dc22135b3147b987d56f37f1dfec39efd63c02 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_ko.properties
@@ -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
@@ -740,9 +739,8 @@ 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.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 7dd68b39f5679a4f92378b8a2fd9d7c48a3b1b39..4f0f655e9f4210bc7157c1fa6f896b5a5f2afe77 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_nl.properties
@@ -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
@@ -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 d3a6355abfc757ecce9bfac58d3ebf70c54cad1f..4dd22d2ae342623f3daa211b6caa70338b1f14c2 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_no.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_no.properties
@@ -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)
@@ -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}
@@ -737,9 +736,8 @@ 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.transportPreferenceDescription = Sett transportmetoden du foretrekker for cloning

diff --git a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
index 340723f7d4ebc98e293377ee61e4864d46cf5838..b7b676dff55e4558b07eb2a8f26adaf684e92cbc 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pl.properties
@@ -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

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 9e697b4f8bc8f11eaa5181f2e5104d493995817a..13dd3dcaa41664da0e144379c15e09df4fc3e81f 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_pt_BR.properties
@@ -169,7 +169,6 @@ gb.accessLevel = acesso
 gb.default = default\r
 gb.setDefault = tornar default\r
 gb.since = desde\r
-gb.status = status\r
 gb.bootDate = data do boot\r
 gb.servletContainer = servlet container\r
 gb.heapMaximum = heap máximo\r

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 5f5b9a947900b9012d0a7e04a4877d35b1fdd235..832f13e78956c7db79f09a682ae044a61c93b8ce 100644 (file)
--- a/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
+++ b/src/main/java/com/gitblit/wicket/GitBlitWebApp_zh_CN.properties
@@ -741,7 +741,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

diff --git a/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java b/src/main/java/com/gitblit/wicket/panels/SshKeysPanel.java
index 4b8787630f830ad7bd081737674edcaa6d41d0be..4ab2483a50851b0583331c4aa6df793e0789b5d3 100644 (file)
--- 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 class SshKeysPanel extends BasePanel {
 \r
                final IModel<String> keyComment = Model.of("");\r
                addKeyForm.add(new TextOption("addKeyComment",\r
-                               getString("gb.comment"),\r
+                               getString("gb.sshKeyComment"),\r
                                getString("gb.sshKeyCommentDescription"),\r
                                "span5",\r
                                keyComment));\r