From 33c4c5b8f30c07ff30de4cd26494becd3ad058c0 Mon Sep 17 00:00:00 2001 From: Phil Hughes Date: Wed, 3 Oct 2018 10:05:43 +0100 Subject: Added file tree to merge request diffs This file tree displays all the diff files in a tree like format Each file is taken and converted into a tree with folders Each folder can be toggled open & closed Clicking a file will scroll to the diff file & highlight with a glow affect Searching the tree list will search only files & return a list of the files without any folders Each file row contains an icon to show changed, new file or deleted Each row will also contain the added & removed lines count Closes https://gitlab.com/gitlab-org/gitlab-ce/issues/14249 --- locale/gitlab.pot | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) (limited to 'locale') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index a9c5e45f9fa..21693ab99a6 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -19,6 +19,11 @@ msgstr "" msgid " Status" msgstr "" +msgid "%d addition" +msgid_plural "%d additions" +msgstr[0] "" +msgstr[1] "" + msgid "%d changed file" msgid_plural "%d changed files" msgstr[0] "" @@ -34,6 +39,11 @@ msgid_plural "%d commits behind" msgstr[0] "" msgstr[1] "" +msgid "%d deleted" +msgid_plural "%d deletions" +msgstr[0] "" +msgstr[1] "" + msgid "%d exporter" msgid_plural "%d exporters" msgstr[0] "" @@ -1284,6 +1294,9 @@ msgstr "" msgid "CircuitBreakerApiLink|circuitbreaker api" msgstr "" +msgid "Clear search" +msgstr "" + msgid "Clear search input" msgstr "" @@ -3702,6 +3715,12 @@ msgstr "" msgid "MergeRequest| %{paragraphStart}changed the description %{descriptionChangedTimes} times %{timeDifferenceMinutes}%{paragraphEnd}" msgstr "" +msgid "MergeRequest|Filter files" +msgstr "" + +msgid "MergeRequest|No files found" +msgstr "" + msgid "Merged" msgstr "" @@ -3962,9 +3981,6 @@ msgstr "" msgid "No file chosen" msgstr "" -msgid "No files found" -msgstr "" - msgid "No files found." msgstr "" @@ -6361,6 +6377,9 @@ msgstr "" msgid "Toggle discussion" msgstr "" +msgid "Toggle file browser" +msgstr "" + msgid "Toggle navigation" msgstr "" -- cgit v1.2.1