From aebae04b6d44d90434f5829c2b2242b1aa1f9f7b Mon Sep 17 00:00:00 2001 From: James Moger Date: Tue, 20 Mar 2012 19:44:04 -0400 Subject: [PATCH] Adjust translation for default branch (HEAD) --- docs/01_features.mkd | 1 + src/com/gitblit/client/EditRepositoryDialog.java | 2 +- src/com/gitblit/wicket/GitBlitWebApp.properties | 1 + src/com/gitblit/wicket/pages/EditRepositoryPage.html | 2 +- 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/docs/01_features.mkd b/docs/01_features.mkd index cb37f5de..c06b000d 100644 --- 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 - Administrators may create, edit, rename, or delete teams through the web UI or RPC interface - Repository Owners may edit repositories through the web UI +- Administrators and Repository Owners may set the default branch through the web UI or RPC interface - Gravatar integration - Git-notes display support - gh-pages display support (Jekyll is not supported) diff --git a/src/com/gitblit/client/EditRepositoryDialog.java b/src/com/gitblit/client/EditRepositoryDialog.java index 5c746cc1..156de15d 100644 --- a/src/com/gitblit/client/EditRepositoryDialog.java +++ b/src/com/gitblit/client/EditRepositoryDialog.java @@ -215,7 +215,7 @@ public class EditRepositoryDialog extends JDialog { descriptionField)); fieldsPanel .add(newFieldPanel(Translation.get("gb.origin"), originField)); - fieldsPanel.add(newFieldPanel(Translation.get("gb.head"), headRefField)); + fieldsPanel.add(newFieldPanel(Translation.get("gb.headRef"), headRefField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.owner"), ownerField)); fieldsPanel.add(newFieldPanel(Translation.get("gb.enableTickets"), diff --git a/src/com/gitblit/wicket/GitBlitWebApp.properties b/src/com/gitblit/wicket/GitBlitWebApp.properties index 2806eee5..3b78b435 100644 --- 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 gb.status = status gb.origin = origin +gb.headRef = default branch (HEAD) gb.headRefDescription = change the ref that HEAD links to. e.g. refs/heads/master gb.federationStrategy = federation strategy gb.federationRegistration = federation registration diff --git a/src/com/gitblit/wicket/pages/EditRepositoryPage.html b/src/com/gitblit/wicket/pages/EditRepositoryPage.html index 26ef37c8..342f0c8d 100644 --- a/src/com/gitblit/wicket/pages/EditRepositoryPage.html +++ b/src/com/gitblit/wicket/pages/EditRepositoryPage.html @@ -14,7 +14,7 @@   -     -- 2.39.5