Add latest changes from gitlab-org/gitlab@master

1 files changed, 62 insertions, 52 deletions

diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 7b22fc00f24..3017de1c198 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -68,6 +68,11 @@ msgstr ""
 msgid "\"%{path}\" did not exist on \"%{ref}\""
 msgstr ""
 
+msgid "%d changed file"
+msgid_plural "%d changed files"
+msgstr[0] ""
+msgstr[1] ""
+
 msgid "%d code quality issue"
 msgid_plural "%d code quality issues"
 msgstr[0] ""
@@ -186,21 +191,11 @@ msgid_plural "%d shards selected"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d staged change"
-msgid_plural "%d staged changes"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%d tag"
 msgid_plural "%d tags"
 msgstr[0] ""
 msgstr[1] ""
 
-msgid "%d unstaged change"
-msgid_plural "%d unstaged changes"
-msgstr[0] ""
-msgstr[1] ""
-
 msgid "%d vulnerability dismissed"
 msgid_plural "%d vulnerabilities dismissed"
 msgstr[0] ""
@@ -431,9 +426,6 @@ msgstr ""
 msgid "%{spanStart}in%{spanEnd} %{errorFn}"
 msgstr ""
 
-msgid "%{staged} staged and %{unstaged} unstaged changes"
-msgstr ""
-
 msgid "%{start} to %{end}"
 msgstr ""
 
@@ -777,9 +769,6 @@ msgstr ""
 msgid "<strong>%{group_name}</strong> group members"
 msgstr ""
 
-msgid "<strong>%{stagedFilesLength} staged</strong> and <strong>%{changedFilesLength} unstaged</strong> changes"
-msgstr ""
-
 msgid "<strong>Deletes</strong> source branch"
 msgstr ""
 
@@ -5154,6 +5143,9 @@ msgstr ""
 msgid "Configure the %{link} integration."
 msgstr ""
 
+msgid "Configure the Jira integration first on your project's %{strong_start} Settings > Integrations > Jira%{strong_end} page."
+msgstr ""
+
 msgid "Configure the way a user creates a new account."
 msgstr ""
 
@@ -6878,13 +6870,10 @@ msgstr ""
 msgid "Disabled mirrors can only be enabled by instance owners. It is recommended that you delete them."
 msgstr ""
 
-msgid "Discard"
-msgstr ""
-
 msgid "Discard all changes"
 msgstr ""
 
-msgid "Discard all unstaged changes?"
+msgid "Discard all changes?"
 msgstr ""
 
 msgid "Discard changes"
@@ -7492,6 +7481,9 @@ msgstr ""
 msgid "Ensure your %{linkStart}environment is part of the deploy stage%{linkEnd} of your CI pipeline to track deployments to your cluster."
 msgstr ""
 
+msgid "Enter 2FA for Admin Mode"
+msgstr ""
+
 msgid "Enter Admin Mode"
 msgstr ""
 
@@ -7531,6 +7523,9 @@ msgstr ""
 msgid "Enter one or more user ID separated by commas"
 msgstr ""
 
+msgid "Enter the code from the two-factor app on your mobile device. If you've lost your device, you may enter one of your recovery codes."
+msgstr ""
+
 msgid "Enter the issue description"
 msgstr ""
 
@@ -7645,6 +7640,12 @@ msgstr ""
 msgid "Environments|Commit"
 msgstr ""
 
+msgid "Environments|Currently showing %{fetched} results."
+msgstr ""
+
+msgid "Environments|Currently showing all results."
+msgstr ""
+
 msgid "Environments|Deploy to..."
 msgstr ""
 
@@ -7678,6 +7679,9 @@ msgstr ""
 msgid "Environments|Logs from"
 msgstr ""
 
+msgid "Environments|Logs from %{start} to %{end}."
+msgstr ""
+
 msgid "Environments|New environment"
 msgstr ""
 
@@ -8962,6 +8966,9 @@ msgstr ""
 msgid "From merge request merge until deploy to production"
 msgstr ""
 
+msgid "From project"
+msgstr ""
+
 msgid "From the Kubernetes cluster details view, install Runner from the applications list"
 msgstr ""
 
@@ -10608,9 +10615,15 @@ msgstr ""
 msgid "Import"
 msgstr ""
 
+msgid "Import %{status}"
+msgstr ""
+
 msgid "Import CSV"
 msgstr ""
 
+msgid "Import Jira issues"
+msgstr ""
+
 msgid "Import Projects from Gitea"
 msgstr ""
 
@@ -10632,6 +10645,9 @@ msgstr ""
 msgid "Import issues"
 msgstr ""
 
+msgid "Import issues from Jira"
+msgstr ""
+
 msgid "Import members"
 msgstr ""
 
@@ -11144,6 +11160,9 @@ msgstr ""
 msgid "January"
 msgstr ""
 
+msgid "Jira Issue Import"
+msgstr ""
+
 msgid "JiraService|Events for %{noteable_model_name} are disabled."
 msgstr ""
 
@@ -12747,6 +12766,9 @@ msgstr ""
 msgid "Modal|Close"
 msgstr ""
 
+msgid "Modified"
+msgstr ""
+
 msgid "Modified in this version"
 msgstr ""
 
@@ -13028,6 +13050,9 @@ msgstr ""
 msgid "New project"
 msgstr ""
 
+msgid "New release"
+msgstr ""
+
 msgid "New runners registration token has been generated!"
 msgstr ""
 
@@ -13621,9 +13646,6 @@ msgstr ""
 msgid "Open"
 msgstr ""
 
-msgid "Open Documentation"
-msgstr ""
-
 msgid "Open Selection"
 msgstr ""
 
@@ -16295,6 +16317,9 @@ msgstr ""
 msgid "Releases are based on Git tags. We recommend naming tags that fit within semantic versioning, for example %{codeStart}v1.0%{codeEnd}, %{codeStart}v2.0-pre%{codeEnd}."
 msgstr ""
 
+msgid "Releases documentation"
+msgstr ""
+
 msgid "Release|Something went wrong while getting the release details"
 msgstr ""
 
@@ -18680,21 +18705,12 @@ msgstr ""
 msgid "Stage & Commit"
 msgstr ""
 
-msgid "Stage all changes"
-msgstr ""
-
 msgid "Stage data updated"
 msgstr ""
 
 msgid "Stage removed"
 msgstr ""
 
-msgid "Staged"
-msgstr ""
-
-msgid "Staged %{type}"
-msgstr ""
-
 msgid "Star a label to make it a priority label. Order the prioritized labels to change their relative priority, by dragging."
 msgstr ""
 
@@ -19304,7 +19320,7 @@ msgstr ""
 msgid "TagsPage|Optionally, add a message to the tag. Leaving this blank creates a %{link_start}lightweight tag.%{link_end}"
 msgstr ""
 
-msgid "TagsPage|Optionally, add release notes to the tag. They will be stored in the GitLab database and displayed on the tags page."
+msgid "TagsPage|Optionally, create a public Release of your project, based on this tag. Release notes are displayed on the %{releases_page_link_start}Releases%{link_end} page. %{docs_link_start}More information%{link_end}"
 msgstr ""
 
 msgid "TagsPage|Release notes"
@@ -19851,6 +19867,9 @@ msgstr ""
 msgid "There are no archived projects yet"
 msgstr ""
 
+msgid "There are no changes"
+msgstr ""
+
 msgid "There are no charts configured for this page"
 msgstr ""
 
@@ -19887,12 +19906,6 @@ msgstr ""
 msgid "There are no projects shared with this group yet"
 msgstr ""
 
-msgid "There are no staged changes"
-msgstr ""
-
-msgid "There are no unstaged changes"
-msgstr ""
-
 msgid "There is a limit of %{ci_project_subscriptions_limit} subscriptions from or to a project."
 msgstr ""
 
@@ -21094,6 +21107,9 @@ msgstr ""
 msgid "Two-Factor Authentication"
 msgstr ""
 
+msgid "Two-Factor Authentication code"
+msgstr ""
+
 msgid "Two-factor Authentication"
 msgstr ""
 
@@ -21304,18 +21320,6 @@ msgstr ""
 msgid "Unschedule job"
 msgstr ""
 
-msgid "Unstage"
-msgstr ""
-
-msgid "Unstage all changes"
-msgstr ""
-
-msgid "Unstaged"
-msgstr ""
-
-msgid "Unstaged %{type}"
-msgstr ""
-
 msgid "Unstar"
 msgstr ""
 
@@ -22799,6 +22803,9 @@ msgstr ""
 msgid "You can only transfer the project to namespaces you manage."
 msgstr ""
 
+msgid "You can only upload one design when dropping onto an existing design."
+msgstr ""
+
 msgid "You can resolve the merge conflict using either the Interactive mode, by choosing %{use_ours} or %{use_theirs} buttons, or by editing the files directly. Commit these changes into %{branch_name}"
 msgstr ""
 
@@ -22952,6 +22959,9 @@ msgstr ""
 msgid "You must set up incoming email before it becomes active."
 msgstr ""
 
+msgid "You must upload a file with the same file name when dropping onto an existing design."
+msgstr ""
+
 msgid "You need a different license to enable FileLocks feature"
 msgstr ""
 
@@ -22988,7 +22998,7 @@ msgstr ""
 msgid "You will lose all changes you've made to this file. This action cannot be undone."
 msgstr ""
 
-msgid "You will lose all the unstaged changes you've made in this project. This action cannot be undone."
+msgid "You will lose all uncommitted changes you've made in this project. This action cannot be undone."
 msgstr ""
 
 msgid "You will need to update your local repositories to point to the new location."