summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorPaul Slaughter <pslaughter@gitlab.com>2018-08-25 17:32:59 +0200
committerPaul Slaughter <pslaughter@gitlab.com>2018-09-04 11:05:40 -0500
commitb47015ad9babf464c1e58ac78c92b8feb7084019 (patch)
tree83c08a4beddc893b95a91d3bc92da2457d5f25a5 /locale
parentafb49b044bcb71702edd3f5ef0139599ddc54ef5 (diff)
downloadgitlab-ce-b47015ad9babf464c1e58ac78c92b8feb7084019.tar.gz
Move project default branch settings under 'Repository'
- Updates specs accordingly - Updates docs accordingly - Brews a fresh pot
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot9
1 files changed, 9 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5f9b02bd559..7d0bd01142c 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -250,6 +250,9 @@ msgstr ""
msgid "A collection of graphs regarding Continuous Integration"
msgstr ""
+msgid "A default branch cannot be chosen for an empty project."
+msgstr ""
+
msgid "A new branch will be created in your fork and a new merge request will be started."
msgstr ""
@@ -2086,6 +2089,9 @@ msgstr ""
msgid "Decline and sign out"
msgstr ""
+msgid "Default Branch"
+msgstr ""
+
msgid "Default: Directly import the Google Code email address or username"
msgstr ""
@@ -5062,6 +5068,9 @@ msgstr ""
msgid "Select target branch"
msgstr ""
+msgid "Select the branch you want to set as the default for this project. All merge requests and commits will automatically be made against this branch unless you specify a different one."
+msgstr ""
+
msgid "Selecting a GitLab user will add a link to the GitLab user in the descriptions of issues and comments (e.g. \"By <a href=\"#\">@johnsmith</a>\"). It will also associate and/or assign these issues and comments with the selected user."
msgstr ""