Commit 26c1fea2 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'jramsay-fix-file-list-title-case' into 'master'

Fix inconsistent use of sentence case

See merge request gitlab-org/gitlab-ce!14668
parents 674106e3 8f2b1093
...@@ -74,8 +74,8 @@ export default { ...@@ -74,8 +74,8 @@ export default {
<thead v-if="!isMini"> <thead v-if="!isMini">
<tr> <tr>
<th class="name">Name</th> <th class="name">Name</th>
<th class="hidden-sm hidden-xs last-commit">Last Commit</th> <th class="hidden-sm hidden-xs last-commit">Last commit</th>
<th class="hidden-xs last-update text-right">Last Update</th> <th class="hidden-xs last-update text-right">Last update</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
%th= s_('ProjectFileTree|Name') %th= s_('ProjectFileTree|Name')
%th.hidden-xs %th.hidden-xs
.pull-left= _('Last commit') .pull-left= _('Last commit')
%th.text-right= _('Last Update') %th.text-right= _('Last update')
- if @path.present? - if @path.present?
%tr.tree-item %tr.tree-item
%td.tree-item-file-name %td.tree-item-file-name
......
...@@ -8,8 +8,8 @@ msgid "" ...@@ -8,8 +8,8 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: gitlab 1.0.0\n" "Project-Id-Version: gitlab 1.0.0\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-09-28 13:28-0400\n" "POT-Creation-Date: 2017-10-03 16:06-0400\n"
"PO-Revision-Date: 2017-09-28 13:28-0400\n" "PO-Revision-Date: 2017-10-03 16:06-0400\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n" "Language: \n"
...@@ -420,9 +420,6 @@ msgstr "" ...@@ -420,9 +420,6 @@ msgstr ""
msgid "Create New Directory" msgid "Create New Directory"
msgstr "" msgstr ""
msgid "Create a new branch"
msgstr ""
msgid "Create a personal access token on your account to pull or push via %{protocol}." msgid "Create a personal access token on your account to pull or push via %{protocol}."
msgstr "" msgstr ""
...@@ -729,9 +726,6 @@ msgstr[1] "" ...@@ -729,9 +726,6 @@ msgstr[1] ""
msgid "Last Pipeline" msgid "Last Pipeline"
msgstr "" msgstr ""
msgid "Last Update"
msgstr ""
msgid "Last commit" msgid "Last commit"
msgstr "" msgstr ""
...@@ -741,6 +735,9 @@ msgstr "" ...@@ -741,6 +735,9 @@ msgstr ""
msgid "Last edited by %{name}" msgid "Last edited by %{name}"
msgstr "" msgstr ""
msgid "Last update"
msgstr ""
msgid "Last updated" msgid "Last updated"
msgstr "" msgstr ""
...@@ -1189,9 +1186,6 @@ msgstr "" ...@@ -1189,9 +1186,6 @@ msgstr ""
msgid "Select a timezone" msgid "Select a timezone"
msgstr "" msgstr ""
msgid "Select existing branch"
msgstr ""
msgid "Select target branch" msgid "Select target branch"
msgstr "" msgstr ""
...@@ -1493,9 +1487,6 @@ msgstr "" ...@@ -1493,9 +1487,6 @@ msgstr ""
msgid "Timeago|a week ago" msgid "Timeago|a week ago"
msgstr "" msgstr ""
msgid "Timeago|a while"
msgstr ""
msgid "Timeago|a year ago" msgid "Timeago|a year ago"
msgstr "" msgstr ""
...@@ -1547,6 +1538,9 @@ msgstr "" ...@@ -1547,6 +1538,9 @@ msgstr ""
msgid "Timeago|in 1 year" msgid "Timeago|in 1 year"
msgstr "" msgstr ""
msgid "Timeago|in a while"
msgstr ""
msgid "Timeago|less than a minute ago" msgid "Timeago|less than a minute ago"
msgstr "" msgstr ""
......
...@@ -23,8 +23,8 @@ describe('RepoSidebar', () => { ...@@ -23,8 +23,8 @@ describe('RepoSidebar', () => {
expect(vm.$el.id).toEqual('sidebar'); expect(vm.$el.id).toEqual('sidebar');
expect(vm.$el.classList.contains('sidebar-mini')).toBeFalsy(); expect(vm.$el.classList.contains('sidebar-mini')).toBeFalsy();
expect(thead.querySelector('.name').textContent).toEqual('Name'); expect(thead.querySelector('.name').textContent).toEqual('Name');
expect(thead.querySelector('.last-commit').textContent).toEqual('Last Commit'); expect(thead.querySelector('.last-commit').textContent).toEqual('Last commit');
expect(thead.querySelector('.last-update').textContent).toEqual('Last Update'); expect(thead.querySelector('.last-update').textContent).toEqual('Last update');
expect(tbody.querySelector('.repo-file-options')).toBeFalsy(); expect(tbody.querySelector('.repo-file-options')).toBeFalsy();
expect(tbody.querySelector('.prev-directory')).toBeFalsy(); expect(tbody.querySelector('.prev-directory')).toBeFalsy();
expect(tbody.querySelector('.loading-file')).toBeFalsy(); expect(tbody.querySelector('.loading-file')).toBeFalsy();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment