Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2020-01-22 00:08:54 +0300
committerGitLab Bot <gitlab-bot@gitlab.com>2020-01-22 00:08:54 +0300
commit36e363d33d5f75aeb75c552d4b325ed8c2d6105f (patch)
tree1ca97e2e47c613eed6b6cd4682c36c92067cab46 /locale
parentd91f5211693e913da5df110b8de841fad87e3653 (diff)
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot17
1 files changed, 7 insertions, 10 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 5ae8d8b23fe..14891309a1b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -8097,6 +8097,11 @@ msgstr ""
msgid "Fetching licenses failed. You are not permitted to perform this action."
msgstr ""
+msgid "File"
+msgid_plural "Files"
+msgstr[0] ""
+msgstr[1] ""
+
msgid "File Hooks"
msgstr ""
@@ -11680,10 +11685,10 @@ msgstr ""
msgid "MergeRequest|Error loading full diff. Please try again."
msgstr ""
-msgid "MergeRequest|No files found"
+msgid "MergeRequest|Filter files or search with %{modifier_key}+p"
msgstr ""
-msgid "MergeRequest|Search files (%{modifier_key}P)"
+msgid "MergeRequest|No files found"
msgstr ""
msgid "Merged"
@@ -21778,9 +21783,6 @@ msgstr ""
msgid "among other things"
msgstr ""
-msgid "and"
-msgstr ""
-
msgid "any-approver for the merge request already exists"
msgstr ""
@@ -22220,11 +22222,6 @@ msgstr ""
msgid "failed to dismiss associated finding(id=%{finding_id}): %{message}"
msgstr ""
-msgid "file"
-msgid_plural "files"
-msgstr[0] ""
-msgstr[1] ""
-
msgid "finding is not found or is already attached to a vulnerability"
msgstr ""