Add latest changes from gitlab-org/gitlab@master

1 files changed, 34 insertions, 35 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e1cff49bee2..48874a6c489 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -220,9 +220,6 @@ msgstr ""
 msgid "%{authorsName}'s thread"
 msgstr ""
 
-msgid "%{buy_now_link_start}Buy now!%{link_end}"
-msgstr ""
-
 msgid "%{commit_author_link} authored %{commit_timeago}"
 msgstr ""
 
@@ -446,6 +443,9 @@ msgstr ""
 msgid "%{state} epics"
 msgstr ""
 
+msgid "%{strongStart}Note:%{strongEnd} Once a custom stage has been added you can re-order stages by dragging them into the desired position."
+msgstr ""
+
 msgid "%{strong_start}%{branch_count}%{strong_end} Branch"
 msgid_plural "%{strong_start}%{branch_count}%{strong_end} Branches"
 msgstr[0] ""
@@ -584,10 +584,12 @@ msgstr ""
 msgid "+ %{numberOfHiddenAssignees} more"
 msgstr ""
 
-msgid "+%{approvers} more approvers"
-msgstr ""
+msgid "+%d more"
+msgid_plural "+%d more"
+msgstr[0] ""
+msgstr[1] ""
 
-msgid "+%{extraOptionCount} more"
+msgid "+%{approvers} more approvers"
 msgstr ""
 
 msgid "+%{tags} more"
@@ -2427,12 +2429,6 @@ msgstr ""
 msgid "Ascending"
 msgstr ""
 
-msgid "Ask an admin to upload a new license to ensure uninterrupted service."
-msgstr ""
-
-msgid "Ask an admin to upload a new license to restore service."
-msgstr ""
-
 msgid "Ask your group maintainer to set up a group Runner."
 msgstr ""
 
@@ -7825,6 +7821,9 @@ msgstr ""
 msgid "Environments|Select environment"
 msgstr ""
 
+msgid "Environments|Select pod"
+msgstr ""
+
 msgid "Environments|Show all"
 msgstr ""
 
@@ -8983,9 +8982,6 @@ msgstr ""
 msgid "For public projects, anyone can view pipelines and access job details (output logs and artifacts)"
 msgstr ""
 
-msgid "For renewal instructions %{link_start}view our Licensing FAQ.%{link_end}"
-msgstr ""
-
 msgid "Forgot your password?"
 msgstr ""
 
@@ -13412,6 +13408,9 @@ msgstr ""
 msgid "No webhooks found, add one in the form above."
 msgstr ""
 
+msgid "No worries, you can still use all the %{strong}%{plan_name}%{strong_close} features for now. You have %{remaining_days} to renew your subscription."
+msgstr ""
+
 msgid "No, directly import the existing email addresses and usernames."
 msgstr ""
 
@@ -16210,12 +16209,6 @@ msgstr ""
 msgid "Pushes"
 msgstr ""
 
-msgid "Pushing code and creation of issues and merge requests has been disabled."
-msgstr ""
-
-msgid "Pushing code and creation of issues and merge requests will be disabled on %{disabled_on}."
-msgstr ""
-
 msgid "PushoverService|%{user_name} deleted branch \"%{ref}\"."
 msgstr ""
 
@@ -18227,6 +18220,9 @@ msgid_plural "Showing %d events"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "Showing %{limit} of %{total_count} issues. "
+msgstr ""
+
 msgid "Showing %{pageSize} of %{total} issues"
 msgstr ""
 
@@ -20177,6 +20173,9 @@ msgstr ""
 msgid "There was an error updating the dashboard, branch named: %{branch} already exists."
 msgstr ""
 
+msgid "There was an error updating the stage order. Please try reloading the page."
+msgstr ""
+
 msgid "There was an error when reseting email token."
 msgstr ""
 
@@ -21654,12 +21653,6 @@ msgstr ""
 msgid "Upload a certificate for your domain with all intermediates"
 msgstr ""
 
-msgid "Upload a new license in the admin area to ensure uninterrupted service."
-msgstr ""
-
-msgid "Upload a new license in the admin area to restore service."
-msgstr ""
-
 msgid "Upload a private key for your certificate"
 msgstr ""
 
@@ -22236,6 +22229,9 @@ msgstr ""
 msgid "View Documentation"
 msgstr ""
 
+msgid "View all issues"
+msgstr ""
+
 msgid "View blame prior to this change"
 msgstr ""
 
@@ -23053,6 +23049,9 @@ msgstr ""
 msgid "You could not create a new trigger."
 msgstr ""
 
+msgid "You didn't renew your %{strong}%{plan_name}%{strong_close} subscription so it was downgraded to the GitLab Core Plan."
+msgstr ""
+
 msgid "You do not have any subscriptions yet"
 msgstr ""
 
@@ -23272,6 +23271,9 @@ msgstr ""
 msgid "YouTube"
 msgstr ""
 
+msgid "Your %{strong}%{plan_name}%{strong_close} subscription will expire on %{strong}%{expires_on}%{strong_close}. After that, you will not to be able to create issues or merge requests as well as many other features."
+msgstr ""
+
 msgid "Your Commit Email will be used for web based operations, such as edits and merges."
 msgstr ""
 
@@ -23392,15 +23394,9 @@ msgstr ""
 msgid "Your issues will be imported in the background. Once finished, you'll get a confirmation email."
 msgstr ""
 
-msgid "Your license expired on %{expires_at}."
-msgstr ""
-
 msgid "Your license is valid from"
 msgstr ""
 
-msgid "Your license will expire in %{remaining_days}."
-msgstr ""
-
 msgid "Your message here"
 msgstr ""
 
@@ -23431,10 +23427,13 @@ msgstr ""
 msgid "Your request for access has been queued for review."
 msgstr ""
 
-msgid "Your trial license expired on %{expires_at}."
+msgid "Your subscription expired!"
+msgstr ""
+
+msgid "Your subscription has been downgraded"
 msgstr ""
 
-msgid "Your trial license will expire in %{remaining_days}."
+msgid "Your subscription will expire in %{remaining_days}"
 msgstr ""
 
 msgid "Zoom meeting added"