Add latest changes from gitlab-org/gitlab@master

1 files changed, 45 insertions, 3 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 834556a2003..d9e85ad9dd7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -9710,6 +9710,9 @@ msgstr ""
 msgid "Create %{workspace} label"
 msgstr ""
 
+msgid "Create Google Cloud project"
+msgstr ""
+
 msgid "Create New Directory"
 msgstr ""
 
@@ -15276,6 +15279,9 @@ msgstr ""
 msgid "Generate site and private keys at"
 msgstr ""
 
+msgid "Generated service account is linked to the selected environment"
+msgstr ""
+
 msgid "Generic"
 msgstr ""
 
@@ -15825,6 +15831,9 @@ msgstr ""
 msgid "GitLab account request rejected"
 msgstr ""
 
+msgid "GitLab and Google Cloud configuration seems to be incomplete. This probably can be fixed by your GitLab administration team. You may share these logs with them:"
+msgstr ""
+
 msgid "GitLab commit"
 msgstr ""
 
@@ -16215,6 +16224,15 @@ msgstr ""
 msgid "Google Cloud authorizations required"
 msgstr ""
 
+msgid "Google Cloud project"
+msgstr ""
+
+msgid "Google Cloud project misconfigured"
+msgstr ""
+
+msgid "Google Cloud project required"
+msgstr ""
+
 msgid "Google authentication is not %{link_start}properly configured%{link_end}. Ask your GitLab administrator if you want to use this service."
 msgstr ""
 
@@ -16836,6 +16854,12 @@ msgstr ""
 msgid "GroupSettings|What are badges?"
 msgstr ""
 
+msgid "GroupSettings|When the number of active users exceeds this number, additional users must be %{user_cap_docs_link_start}approved by an owner%{user_cap_docs_link_end}. Leave empty if you don't want to enforce approvals."
+msgstr ""
+
+msgid "GroupSettings|When the number of active users exceeds this number, additional users must be %{user_cap_docs_link_start}approved by an owner%{user_cap_docs_link_end}. Leave empty if you don't want to enforce approvals. Increasing the user cap will not automatically approve pending users."
+msgstr ""
+
 msgid "GroupSettings|You can only transfer the group to a group you manage."
 msgstr ""
 
@@ -23265,6 +23289,9 @@ msgstr ""
 msgid "New schedule"
 msgstr ""
 
+msgid "New service account is generated for the selected Google Cloud project"
+msgstr ""
+
 msgid "New snippet"
 msgstr ""
 
@@ -27422,6 +27449,9 @@ msgstr ""
 msgid "ProjectSettings|Snippets"
 msgstr ""
 
+msgid "ProjectSettings|Squash commit message template"
+msgstr ""
+
 msgid "ProjectSettings|Squash commits when merging"
 msgstr ""
 
@@ -27446,6 +27476,9 @@ msgstr ""
 msgid "ProjectSettings|The commit message used when merging, if the merge method creates a merge commit. %{link_start}Learn more about syntax and variables.%{link_end}"
 msgstr ""
 
+msgid "ProjectSettings|The commit message used when squashing commits. %{link_start}Learn more about syntax and variables.%{link_end}"
+msgstr ""
+
 msgid "ProjectSettings|The default target project for merge requests created in this fork project."
 msgstr ""
 
@@ -37091,6 +37124,9 @@ msgstr ""
 msgid "Unknown response text"
 msgstr ""
 
+msgid "Unknown root"
+msgstr ""
+
 msgid "Unknown user"
 msgstr ""
 
@@ -39083,9 +39119,6 @@ msgstr ""
 msgid "When paused, GitLab still tracks the changes. This is useful for cluster/index migrations."
 msgstr ""
 
-msgid "When the number of active users exceeds this number, additional users must be %{user_cap_docs_link_start}approved by an owner%{user_cap_docs_link_end}. Leave empty if you don't want to enforce approvals."
-msgstr ""
-
 msgid "When this merge request is accepted"
 msgid_plural "When these merge requests are accepted"
 msgstr[0] ""
@@ -39736,6 +39769,9 @@ msgstr ""
 msgid "You could not create a new trigger."
 msgstr ""
 
+msgid "You do not have any Google Cloud projects. Please create a Google Cloud project and then reload this page."
+msgstr ""
+
 msgid "You do not have any subscriptions yet"
 msgstr ""
 
@@ -41681,9 +41717,15 @@ msgstr ""
 msgid "mrWidget|To approve this merge request, please enter your password. This project requires all approvals to be authenticated."
 msgstr ""
 
+msgid "mrWidget|To change these default messages, edit the templates for both the merge and squash commit messages. %{linkStart}Learn more.%{linkEnd}"
+msgstr ""
+
 msgid "mrWidget|To change this default message, edit the template for merge commit messages. %{linkStart}Learn more.%{linkEnd}"
 msgstr ""
 
+msgid "mrWidget|To change this default message, edit the template for squash commit messages. %{linkStart}Learn more.%{linkEnd}"
+msgstr ""
+
 msgid "mrWidget|To merge, a Jira issue key must be mentioned in the title or description."
 msgstr ""