Adjust translation for default branch (HEAD)

diff --git a/docs/01_features.mkd b/docs/01_features.mkd
index cb37f5de3ada11a6be30210ab950b27478e21bc0..c06b000dcc5f52ddc0892b20181faacb0ea087de 100644 (file)
--- a/docs/01_features.mkd
+++ b/docs/01_features.mkd
@@ -18,6 +18,7 @@
 - Administrators may create, edit, rename, or delete users through the web UI or RPC interface\r
 - Administrators may create, edit, rename, or delete teams through the web UI or RPC interface\r
 - Repository Owners may edit repositories through the web UI\r
+- Administrators and Repository Owners may set the default branch through the web UI or RPC interface\r
 - Gravatar integration\r
 - Git-notes display support\r
 - gh-pages display support (Jekyll is not supported)\r

diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java
index 5c746cc13aac948bbd364b13aebdd83db5a2c390..156de15de1793b5be4a8b5390859ccec42aed995 100644 (file)
--- a/src/com/gitblit/client/EditRepositoryDialog.java
+++ b/src/com/gitblit/client/EditRepositoryDialog.java
@@ -215,7 +215,7 @@ public class EditRepositoryDialog extends JDialog {
                                descriptionField));\r
                fieldsPanel\r
                                .add(newFieldPanel(Translation.get("gb.origin"), originField));\r
-               fieldsPanel.add(newFieldPanel(Translation.get("gb.head"), headRefField));\r
+               fieldsPanel.add(newFieldPanel(Translation.get("gb.headRef"), headRefField));\r
                fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField));\r
 \r
                fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"),\r

diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties
index 2806eee5c3cb2c9b82297e5acdfb1a471ce38c81..3b78b435aec2ad2de9ff833849ef1aeb944b33b1 100644 (file)
--- a/src/com/gitblit/wicket/GitBlitWebApp.properties
+++ b/src/com/gitblit/wicket/GitBlitWebApp.properties
@@ -131,6 +131,7 @@ gb.registrations = federation registrations
 gb.sendProposal propose\r
 gb.status = status\r
 gb.origin = origin\r
+gb.headRef = default branch (HEAD)\r
 gb.headRefDescription = change the ref that HEAD links to. e.g. refs/heads/master\r
 gb.federationStrategy = federation strategy\r
 gb.federationRegistration = federation registration\r

diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
index 26ef37c878661e5799647124fcd321ebac3f3149..342f0c8d3255f38c3812f891745361cebb890ba3 100644 (file)
--- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html
+++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html
@@ -14,7 +14,7 @@
                                <tr><th><wicket:message key="gb.name"></wicket:message></th><td class="edit"><input class="span4" type="text" wicket:id="name" id="name" size="40" tabindex="1" /> &nbsp;<span class="help-inline"><wicket:message key="gb.nameDescription"></wicket:message></span></td></tr>\r
                                <tr><th><wicket:message key="gb.description"></wicket:message></th><td class="edit"><input class="span4" type="text" wicket:id="description" size="40" tabindex="2" /></td></tr>\r
                                <tr><th><wicket:message key="gb.origin"></wicket:message></th><td class="edit"><input class="span5" type="text" wicket:id="origin" size="80" tabindex="3" /></td></tr>\r
-                               <tr><th><wicket:message key="gb.head"></wicket:message></th><td class="edit"><select wicket:id="HEAD" tabindex="4" /> &nbsp;<span class="help-inline"><wicket:message key="gb.headRefDescription"></wicket:message></span></td></tr>\r
+                               <tr><th><wicket:message key="gb.headRef"></wicket:message></th><td class="edit"><select wicket:id="HEAD" tabindex="4" /> &nbsp;<span class="help-inline"><wicket:message key="gb.headRefDescription"></wicket:message></span></td></tr>\r
                                <tr><th><wicket:message key="gb.owner"></wicket:message></th><td class="edit"><select wicket:id="owner" tabindex="5" /> &nbsp;<span class="help-inline"><wicket:message key="gb.ownerDescription"></wicket:message></span></td></tr>\r
                                <tr><th><wicket:message key="gb.enableTickets"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useTickets" tabindex="6" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useTicketsDescription"></wicket:message></span></label></td></tr>\r
                                <tr><th><wicket:message key="gb.enableDocs"></wicket:message></th><td class="edit"><label class="checkbox"><input type="checkbox" wicket:id="useDocs" tabindex="7" /> &nbsp;<span class="help-inline"><wicket:message key="gb.useDocsDescription"></wicket:message></span></label></td></tr>\r