Update locale file to resolve conflicts

locale/gitlab.pot

@@ -215,6 +215,9 @@ msgstr ""
 msgid "%{group_name} uses group managed accounts. You need to create a new GitLab account which will be managed by %{group_name}."
 msgstr ""
 
+msgid "%{icon}You are about to add %{usersTag} people to the discussion. Proceed with caution."
+msgstr ""
+
 msgid "%{issuableType} will be removed! Are you sure?"
 msgstr ""
 
@@ -2456,6 +2459,9 @@ msgstr ""
 msgid "Cancel this job"
 msgstr ""
 
+msgid "Cancelling Preview"
+msgstr ""
+
 msgid "Cannot be merged automatically"
 msgstr ""
 
@@ -4464,6 +4470,9 @@ msgstr ""
 msgid "Deployed"
 msgstr ""
 
+msgid "Deployed %{deployedSince}"
+msgstr ""
+
 msgid "Deployed to"
 msgstr ""
 
@@ -4689,6 +4698,9 @@ msgstr ""
 msgid "Download artifacts"
 msgstr ""
 
+msgid "Download as"
+msgstr ""
+
 msgid "Download asset"
 msgstr ""
 
@@ -4998,6 +5010,9 @@ msgstr ""
 msgid "Enter the merge request title"
 msgstr ""
 
+msgid "Enter zen mode"
+msgstr ""
+
 msgid "EnviornmentDashboard|You are looking at the last updated environment"
 msgstr ""
 
@@ -5481,6 +5496,9 @@ msgstr ""
 msgid "Expand approvers"
 msgstr ""
 
+msgid "Expand dropdown"
+msgstr ""
+
 msgid "Expand sidebar"
 msgstr ""
 
@@ -5703,6 +5721,9 @@ msgstr ""
 msgid "Failure"
 msgstr ""
 
+msgid "Fast-forward merge is not possible. Rebase the source branch onto the target branch or merge target branch into source branch to allow this merge request to be merged."
+msgstr ""
+
 msgid "Fast-forward merge without a merge commit"
 msgstr ""
 
@@ -6053,6 +6074,9 @@ msgstr ""
 msgid "Friday"
 msgstr ""
 
+msgid "From"
+msgstr ""
+
 msgid "From %{providerTitle}"
 msgstr ""
 
@@ -7189,6 +7213,12 @@ msgstr ""
 msgid "ImageDiffViewer|Swipe"
 msgstr ""
 
+msgid "ImageViewerDimensions|H"
+msgstr ""
+
+msgid "ImageViewerDimensions|W"
+msgstr ""
+
 msgid "Impersonation has been disabled"
 msgstr ""
 
@@ -8350,6 +8380,9 @@ msgstr ""
 msgid "Markdown enabled"
 msgstr ""
 
+msgid "Markdown is supported"
+msgstr ""
+
 msgid "Marks this issue as a duplicate of %{duplicate_reference}."
 msgstr ""
 
@@ -9752,6 +9785,12 @@ msgstr ""
 msgid "Pipeline"
 msgstr ""
 
+msgid "Pipeline %{label}"
+msgstr ""
+
+msgid "Pipeline %{label} for \"%{dataTitle}\""
+msgstr ""
+
 msgid "Pipeline Schedule"
 msgstr ""
 
@@ -11234,6 +11273,12 @@ msgstr ""
 msgid "Real-time features"
 msgstr ""
 
+msgid "Rebase"
+msgstr ""
+
+msgid "Rebase in progress"
+msgstr ""
+
 msgid "Receive alerts from manually configured Prometheus servers."
 msgstr ""
 
@@ -12175,6 +12220,9 @@ msgstr ""
 msgid "Select members to invite"
 msgstr ""
 
+msgid "Select merge moment"
+msgstr ""
+
 msgid "Select milestone"
 msgstr ""
 
@@ -12744,6 +12792,9 @@ msgstr ""
 msgid "Something went wrong while resolving this discussion. Please try again."
 msgstr ""
 
+msgid "Something went wrong while stopping this environment. Please try again."
+msgstr ""
+
 msgid "Something went wrong, unable to add %{project} to dashboard"
 msgstr ""
 
@@ -14024,6 +14075,9 @@ msgstr ""
 msgid "This is a \"Ghost User\", created to hold all issues authored by users that have since been deleted. This user cannot be removed."
 msgstr ""
 
+msgid "This is a Work in Progress"
+msgstr ""
+
 msgid "This is a confidential issue."
 msgstr ""
 
@@ -14045,6 +14099,9 @@ msgstr ""
 msgid "This is your current session"
 msgstr ""
 
+msgid "This issue is %{confidentialLinkStart}confidential%{linkEnd} and %{lockedLinkStart}locked%{linkEnd}."
+msgstr ""
+
 msgid "This issue is confidential"
 msgstr ""
 
@@ -14745,6 +14802,9 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+msgid "Unable to apply suggestions to a deleted line."
+msgstr ""
+
 msgid "Unable to connect to Prometheus server"
 msgstr ""
 
@@ -14868,6 +14928,9 @@ msgstr ""
 msgid "Unsubscribe from %{type}"
 msgstr ""
 
+msgid "Until"
+msgstr ""
+
 msgid "Unverified"
 msgstr ""
 
@@ -16700,6 +16763,9 @@ msgstr ""
 msgid "could not read private key, is the passphrase correct?"
 msgstr ""
 
+msgid "created"
+msgstr ""
+
 msgid "customize"
 msgstr ""
 
@@ -16894,6 +16960,15 @@ msgstr ""
 msgid "mrWidgetCommitsAdded|1 merge commit"
 msgstr ""
 
+msgid "mrWidgetNothingToMerge|Currently there are no changes in this merge request's source branch. Please push new commits or use a different branch."
+msgstr ""
+
+msgid "mrWidgetNothingToMerge|Interested parties can even contribute by pushing commits if they want to."
+msgstr ""
+
+msgid "mrWidgetNothingToMerge|Merge requests are a place to propose changes you have made to a project and discuss those changes with others."
+msgstr ""
+
 msgid "mrWidget| Please restore it or use a different %{missingBranchName} branch"
 msgstr ""
 
@@ -17050,6 +17125,9 @@ msgstr ""
 msgid "mrWidget|Request to merge"
 msgstr ""
 
+msgid "mrWidget|Resolve WIP status"
+msgstr ""
+
 msgid "mrWidget|Resolve conflicts"
 msgstr ""
 
@@ -17116,6 +17194,9 @@ msgstr ""
 msgid "mrWidget|This project is archived, write access has been disabled"
 msgstr ""
 
+msgid "mrWidget|When this merge request is ready, remove the WIP: prefix from the title to allow it to be merged"
+msgstr ""
+
 msgid "mrWidget|You are not allowed to edit this project directly. Please fork to make changes."
 msgstr ""
 
@@ -17214,6 +17295,9 @@ msgid_plural "projects"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "project avatar"
+msgstr ""
+
 msgid "quick actions"
 msgstr ""
 
@@ -17332,12 +17416,21 @@ msgstr ""
 msgid "to list"
 msgstr ""
 
+msgid "toggle collapse"
+msgstr ""
+
+msgid "toggle dropdown"
+msgstr ""
+
 msgid "triggered"
 msgstr ""
 
 msgid "updated"
 msgstr ""
 
+msgid "user avatar"
+msgstr ""
+
 msgid "username"
 msgstr ""