summaryrefslogtreecommitdiff
path: root/locale
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2019-03-07 11:33:15 +0000
committerDouwe Maan <douwe@gitlab.com>2019-03-07 11:33:15 +0000
commit6cfa5ee536c30522241bcf09e805d7eb3adbf481 (patch)
tree89301502c5cc76bb11cba0ae29cc6df46c97277a /locale
parentc45bb62c0ae36018891a343c7c820fc1a901e33e (diff)
parentcea59dbe030bfde83247ef27c49ffd5267b194ea (diff)
downloadgitlab-ce-6cfa5ee536c30522241bcf09e805d7eb3adbf481.tar.gz
Merge branch 'expand-diff-to-full-file' into 'master'
Expand diff to entire file Closes #19054 See merge request gitlab-org/gitlab-ce!24406
Diffstat (limited to 'locale')
-rw-r--r--locale/gitlab.pot12
1 files changed, 12 insertions, 0 deletions
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index 9552dd03039..d20ad666ba7 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -2944,6 +2944,9 @@ msgstr ""
msgid "Edit environment"
msgstr ""
+msgid "Edit file"
+msgstr ""
+
msgid "Edit files in the editor and commit changes here"
msgstr ""
@@ -4581,6 +4584,12 @@ msgstr ""
msgid "Logs"
msgstr ""
+msgid "MRDiff|Show changes only"
+msgstr ""
+
+msgid "MRDiff|Show full file"
+msgstr ""
+
msgid "Make sure you're logged into the account that owns the projects you'd like to import."
msgstr ""
@@ -4749,6 +4758,9 @@ msgstr ""
msgid "MergeRequest| %{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}"
msgstr ""
+msgid "MergeRequest|Error loading full diff. Please try again."
+msgstr ""
+
msgid "MergeRequest|Filter files"
msgstr ""