From 4361c89130fc2350be6ff79aaaf4bb3a55f83022 Mon Sep 17 00:00:00 2001 From: Marcel Amirault Date: Fri, 6 Sep 2019 20:43:20 +0000 Subject: Update keyboard shortcuts modal and doc Add missing shortcuts, remove shortcuts that don't exist, and reorder as needed --- .../javascripts/behaviors/shortcuts/shortcuts.js | 2 - .../behaviors/shortcuts/shortcuts_issuable.js | 8 +- .../behaviors/shortcuts/shortcuts_navigation.js | 2 - .../behaviors/shortcuts/shortcuts_network.js | 2 - .../behaviors/shortcuts/shortcuts_wiki.js | 2 - app/assets/stylesheets/framework/modal.scss | 6 + app/views/help/_shortcuts.html.haml | 350 +++++++++------------ changelogs/unreleased/keyboard-shortcuts-2.yml | 5 + doc/workflow/shortcuts.md | 191 ++++++----- locale/gitlab.pot | 133 ++++---- 10 files changed, 348 insertions(+), 353 deletions(-) create mode 100644 changelogs/unreleased/keyboard-shortcuts-2.yml diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js index 7e3515b1f4b..66cb9fd7672 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts.js @@ -46,7 +46,6 @@ export default class Shortcuts { $(document).on('click.more_help', '.js-more-help-button', function clickMoreHelp(e) { $(this).remove(); - $('.hidden-shortcut').show(); e.preventDefault(); }); } @@ -104,7 +103,6 @@ export default class Shortcuts { return results; } - $('.hidden-shortcut').show(); return $('.js-more-help-button').remove(); }); } diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js index c8eb96a625c..f7b327b2af1 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_issuable.js @@ -6,7 +6,7 @@ import { CopyAsGFM } from '../markdown/copy_as_gfm'; import { getSelectedFragment } from '~/lib/utils/common_utils'; export default class ShortcutsIssuable extends Shortcuts { - constructor(isMergeRequest) { + constructor() { super(); Mousetrap.bind('a', () => ShortcutsIssuable.openSidebarDropdown('assignee')); @@ -14,12 +14,6 @@ export default class ShortcutsIssuable extends Shortcuts { Mousetrap.bind('l', () => ShortcutsIssuable.openSidebarDropdown('labels')); Mousetrap.bind('r', ShortcutsIssuable.replyWithSelectedText); Mousetrap.bind('e', ShortcutsIssuable.editIssue); - - if (isMergeRequest) { - this.enabledHelp.push('.hidden-shortcut.merge_requests'); - } else { - this.enabledHelp.push('.hidden-shortcut.issues'); - } } static replyWithSelectedText() { diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js index bef1553703b..b46b4132ba8 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_navigation.js @@ -23,7 +23,5 @@ export default class ShortcutsNavigation extends Shortcuts { Mousetrap.bind('g e', () => findAndFollowLink('.shortcuts-environments')); Mousetrap.bind('g l', () => findAndFollowLink('.shortcuts-metrics')); Mousetrap.bind('i', () => findAndFollowLink('.shortcuts-new-issue')); - - this.enabledHelp.push('.hidden-shortcut.project'); } } diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js index a88c280fa3b..3e791e4673a 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_network.js @@ -11,7 +11,5 @@ export default class ShortcutsNetwork extends ShortcutsNavigation { Mousetrap.bind(['down', 'j'], graph.scrollDown); Mousetrap.bind(['shift+up', 'shift+k'], graph.scrollTop); Mousetrap.bind(['shift+down', 'shift+j'], graph.scrollBottom); - - this.enabledHelp.push('.hidden-shortcut.network'); } } diff --git a/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js b/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js index 208c91a1f08..8b7e6a56d25 100644 --- a/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js +++ b/app/assets/javascripts/behaviors/shortcuts/shortcuts_wiki.js @@ -6,8 +6,6 @@ export default class ShortcutsWiki extends ShortcutsNavigation { constructor() { super(); Mousetrap.bind('e', ShortcutsWiki.editWiki); - - this.enabledHelp.push('.hidden-shortcut.wiki'); } static editWiki() { diff --git a/app/assets/stylesheets/framework/modal.scss b/app/assets/stylesheets/framework/modal.scss index fd9a75bc5b6..9c924559135 100644 --- a/app/assets/stylesheets/framework/modal.scss +++ b/app/assets/stylesheets/framework/modal.scss @@ -2,6 +2,12 @@ max-width: 98%; } +.modal-1040 { + @include media-breakpoint-up(xl) { + max-width: 1040px; + } +} + .modal-header { background-color: $modal-body-bg; diff --git a/app/views/help/_shortcuts.html.haml b/app/views/help/_shortcuts.html.haml index a996c86a256..f1ba804f920 100644 --- a/app/views/help/_shortcuts.html.haml +++ b/app/views/help/_shortcuts.html.haml @@ -1,5 +1,5 @@ #modal-shortcuts.modal{ tabindex: -1 } - .modal-dialog.modal-lg + .modal-dialog.modal-lg.modal-1040 .modal-content .modal-header %h4.modal-title @@ -11,104 +11,100 @@ .modal-body .row .col-lg-4 - %table.shortcut-mappings + %table.shortcut-mappings.text-2 %tbody %tr %th %th= _('Global Shortcuts') %tr %td.shortcut - %kbd s - %td= _('Focus Search') + %kbd ? + %td= _('Toggle this dialog') %tr %td.shortcut - %kbd f - %td= _('Focus Filter') + %kbd shift p + %td= _('Go to your projects') %tr %td.shortcut - %kbd p - %kbd b - %td= _('Toggle the Performance Bar') + %kbd shift g + %td= _('Go to your groups') %tr %td.shortcut - %kbd ? - %td= _('Show/hide this dialog') + %kbd shift a + %td= _('Go to the activity feed') %tr %td.shortcut - - if browser.platform.mac? - %kbd ⌘ shift p - - else - %kbd ctrl shift p - %td= _('Toggle Markdown preview') + %kbd shift l + %td= _('Go to the milestone list') %tr %td.shortcut - %kbd - %i.fa.fa-arrow-up - %td= _('Edit last comment (when focused on an empty textarea)') + %kbd shift s + %td= _('Go to your snippets') %tr %td.shortcut - %kbd shift t - %td - = _('Go to todos') + %kbd s + %td= _('Start search') %tr %td.shortcut - %kbd shift a - %td - = _('Go to the activity feed') + %kbd shift i + %td= _('Go to your issues') %tr %td.shortcut - %kbd shift p - %td - = _('Go to projects') + %kbd shift m + %td= _('Go to your merge requests') %tr %td.shortcut - %kbd shift i - %td - = _('Go to issues') + %kbd shift t + %td= _('Go to your To-Do list') %tr %td.shortcut - %kbd shift m - %td - = _('Go to merge requests') + %kbd p + %kbd b + %td= _('Toggle the Performance Bar') + %tbody %tr - %td.shortcut - %kbd shift g - %td - = _('Go to groups') + %th + %th= _('Web IDE') %tr %td.shortcut - %kbd shift l - %td - = _('Go to milestones') + - if browser.platform.mac? + %kbd ⌘ p + - else + %kbd ctrl p + %td= _('Go to file') %tr %td.shortcut - %kbd shift s - %td - = _('Go to snippets') + - if browser.platform.mac? + %kbd ⌘ enter + - else + %kbd ctrl enter + %td= _('Commit (when editing commit message)') %tbody %tr %th - %th= _('Finding Project File') + %th= _('Wiki pages') %tr %td.shortcut - %kbd - %i.fa.fa-arrow-up - %td= _('Move selection up') + %kbd e + %td= _('Edit wiki page') + %tbody %tr - %td.shortcut - %kbd - %i.fa.fa-arrow-down - %td= _('Move selection down') + %th + %th= _('Editing') %tr %td.shortcut - %kbd enter - %td= _('Open Selection') + - if browser.platform.mac? + %kbd ⌘ shift p + - else + %kbd ctrl shift p + %td= _('Toggle Markdown preview') %tr %td.shortcut - %kbd esc - %td= _('Go back') + %kbd + %i.fa.fa-arrow-up + %td= _('Edit your most recent comment in a thread (from an empty textarea)') .col-lg-4 - %table.shortcut-mappings + %table.shortcut-mappings.text-2 %tbody %tr %th @@ -117,105 +113,94 @@ %td.shortcut %kbd g %kbd p - %td - = _('Go to the project\'s overview page') + %td= _('Go to the project\'s overview page') %tr %td.shortcut %kbd g %kbd v - %td - = _('Go to the project\'s activity feed') + %td= _('Go to the project\'s activity feed') %tr %td.shortcut %kbd g - %kbd f - %td - = _('Go to files') + %kbd r + %td= _('Go to releases') %tr %td.shortcut %kbd g - %kbd c - %td - = _('Go to commits') + %kbd f + %td= _('Go to files') + %tr + %td.shortcut + %kbd t + %td= _('Go to find file') %tr %td.shortcut %kbd g - %kbd j - %td - = _('Go to jobs') + %kbd c + %td= _('Go to commits') %tr %td.shortcut %kbd g %kbd n - %td - = _('Go to network graph') + %td= _('Go to repository graph') %tr %td.shortcut %kbd g %kbd d - %td - = _('Go to repository charts') + %td= _('Go to repository charts') %tr %td.shortcut %kbd g %kbd i - %td - = _('Go to issues') + %td= _('Go to issues') + %tr + %td.shortcut + %kbd i + %td= _('New issue') %tr %td.shortcut %kbd g %kbd b - %td - = _('Go to issue boards') + %td= _('Go to issue boards') %tr %td.shortcut %kbd g %kbd m - %td - = _('Go to merge requests') + %td= _('Go to merge requests') %tr %td.shortcut %kbd g - %kbd e - %td - = _('Go to environments') + %kbd j + %td= _('Go to jobs') %tr %td.shortcut %kbd g %kbd l - %td - = _('Go to metrics') + %td= _('Go to metrics') + %tr + %td.shortcut + %kbd g + %kbd e + %td= _('Go to environments') %tr %td.shortcut %kbd g %kbd k - %td - = _('Go to kubernetes') + %td= _('Go to kubernetes') %tr %td.shortcut %kbd g %kbd s - %td - = _('Go to snippets') + %td= _('Go to snippets') %tr %td.shortcut %kbd g %kbd w - %td - = _('Go to wiki') - %tr - %td.shortcut - %kbd t - %td= _('Go to finding file') - %tr - %td.shortcut - %kbd i - %td= _('New issue') - + %td= _('Go to wiki') %tbody %tr %th - %th= _('Project Files browsing') + %th= _('Project Files') %tr %td.shortcut %kbd @@ -230,38 +215,87 @@ %td.shortcut %kbd enter %td= _('Open Selection') - %tbody %tr - %th - %th= _('Project File') + %td.shortcut + %kbd esc + %td= _('Go back (while searching for files') %tr %td.shortcut %kbd y - %td= _('Go to file permalink') + %td= _('Go to file permalink (while viewing a file)') + .col-lg-4 + %table.shortcut-mappings.text-2 %tbody %tr %th - %th= _('Web IDE') + %th= _('Issues / Merge Requests') + %tr + %td.shortcut + %kbd a + %td= _('Change assignee') + %tr + %td.shortcut + %kbd m + %td= _('Change milestone') + %tr + %td.shortcut + %kbd r + %td= _('Comment/Reply (quoting selected text)') + %tr + %td.shortcut + %kbd e + %td= _('Edit description') + %tr + %td.shortcut + %kbd l + %td= _('Change label') + %tr + %td.shortcut + %kbd ] + \/ + %kbd j + %td= _('Next file in diff (MRs only)') + %tr + %td.shortcut + %kbd [ + \/ + %kbd k + %td= _('Previous file in diff (MRs only)') %tr %td.shortcut - if browser.platform.mac? %kbd ⌘ p - else %kbd ctrl p - %td= _('Go to file') + %td= _('Go to file (MRs only)') %tr %td.shortcut - - if browser.platform.mac? - %kbd ⌘ enter - - else - %kbd ctrl enter - %td= _('Commit (when editing commit message)') - .col-lg-4 - %table.shortcut-mappings - %tbody.hidden-shortcut.network{ style: 'display:none' } + %kbd n + %td= _('Next unresolved discussion (MRs only)') + %tr + %td.shortcut + %kbd p + %td= _('Previous unresolved discussion (MRs only)') + %tbody %tr %th - %th= _('Network Graph') + %th= _('Epics (Ultimate / Gold license only)') + %tr + %td.shortcut + %kbd r + %td= _('Comment/Reply (quoting selected text)') + %tr + %td.shortcut + %kbd e + %td= _('Edit epic description') + %tr + %td.shortcut + %kbd l + %td= _('Change label') + %tbody + %tr + %th + %th= _('Repository Graph') %tr %td.shortcut %kbd @@ -295,92 +329,12 @@ %kbd shift %i.fa.fa-arrow-up - \/ - %kbd - shift k + \/ k %td= _('Scroll to top') %tr %td.shortcut %kbd shift %i.fa.fa-arrow-down - \/ - %kbd - shift j + \/ j %td= _('Scroll to bottom') - %tbody.hidden-shortcut.issues{ style: 'display:none' } - %tr - %th - %th= _('Issues') - %tr - %td.shortcut - %kbd a - %td= _('Change assignee') - %tr - %td.shortcut - %kbd m - %td= _('Change milestone') - %tr - %td.shortcut - %kbd r - %td= _('Reply (quoting selected text)') - %tr - %td.shortcut - %kbd e - %td= _('Edit issue') - %tr - %td.shortcut - %kbd l - %td= _('Change Label') - %tbody.hidden-shortcut.merge_requests{ style: 'display:none' } - %tr - %th - %th= _('Merge Requests') - %tr - %td.shortcut - %kbd a - %td= _('Change assignee') - %tr - %td.shortcut - %kbd m - %td= _('Change milestone') - %tr - %td.shortcut - %kbd r - %td= _('Reply (quoting selected text)') - %tr - %td.shortcut - %kbd e - %td= _('Edit merge request') - %tr - %td.shortcut - %kbd l - %td= _('Change Label') - %tr - %td.shortcut - %kbd ] - \/ - %kbd j - %td= _('Move to next file') - %tr - %td.shortcut - %kbd [ - \/ - %kbd k - %td= _('Move to previous file') - %tr - %td.shortcut - %kbd n - %td= _('Move to next unresolved discussion') - %tr - %td.shortcut - %kbd p - %td= _('Move to previous unresolved discussion') - %tbody.hidden-shortcut.wiki{ style: 'display:none' } - %tr - %th - %th= _('Wiki pages') - %tr - %td.shortcut - %kbd e - %td= _('Edit wiki page') diff --git a/changelogs/unreleased/keyboard-shortcuts-2.yml b/changelogs/unreleased/keyboard-shortcuts-2.yml new file mode 100644 index 00000000000..a6a2266b20a --- /dev/null +++ b/changelogs/unreleased/keyboard-shortcuts-2.yml @@ -0,0 +1,5 @@ +--- +title: Clean up keyboard shortcuts help modal, removing and adding as needed +merge_request: 31642 +author: +type: other diff --git a/doc/workflow/shortcuts.md b/doc/workflow/shortcuts.md index 5d08bf5e77d..2ec733182f8 100644 --- a/doc/workflow/shortcuts.md +++ b/doc/workflow/shortcuts.md @@ -1,109 +1,134 @@ +--- +type: reference +--- + # GitLab keyboard shortcuts -You can see GitLab's keyboard shortcuts by using shift + ? +GitLab has many useful keyboard shortcuts to make it easier to access different features. +You can see the quick reference sheet within GitLab itself with Shift + ?. -## Global Shortcuts +The [Global Shortcuts](#global-shortcuts) work from any area of GitLab, but you must +be in specific pages for the other shortcuts to be available, as explained in each +section below. -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| n | Main navigation | -| s | Focus search | -| f | Focus filter | -| p + b | Show/hide the Performance Bar | -| ? | Show/hide this dialog | -| Cmd/Ctrl + Shift + p | Toggle markdown preview | -| ↑ | Edit last comment (when focused on an empty textarea) | +## Global Shortcuts -## Project Files Browsing +These shortcuts are available in most areas of GitLab + +| Keyboard Shortcut | Description | +| ------------------------------- | ----------- | +| ? | Show/hide shortcut reference sheet. | +| Shift + p | Go to your Projects page. | +| Shift + g | Go to your Groups page. | +| Shift + a | Go to your Activity page. | +| Shift + l | Go to your Milestones page. | +| Shift + s | Go to your Snippets page. | +| s | Put cursor in the issues/merge requests search. | +| Shift + i | Go to your Issues page. | +| Shift + m | Go to your Merge requests page.| +| Shift + t | Go to your To-Do List page. | +| p + b | Show/hide the Performance Bar. | + +Additionally, the following shortcuts are available when editing text in text fields, +for example comments, replies, or issue and merge request descriptions: + +| Keyboard Shortcut | Description | +| ---------------------------------------------------------------------- | ----------- | +| ↑ | Edit your last comment. You must be in a blank text field below a thread, and you must already have at least one comment in the thread. | +| ⌘ (Mac) / Ctrl + Shift + p | Toggle Markdown preview, when editing text in a text field that has **Write** and **Preview** tabs at the top. | -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| ↑ | Move selection up | -| ↓ | Move selection down | -| enter | Open selection | +## Project -## Finding Project File +These shortcuts are available from any page within a project. You must type them +relatively quickly to work, and they will take you to another page in the project. + +| Keyboard Shortcut | Description | +| --------------------------- | ----------- | +| g + p | Go to the project home page (**Project > Details**). | +| g + v | Go to the project activity feed (**Project > Activity**). | +| g + r | Go to the project releases list (**Project > Releases**). | +| g + f | Go to the [project files](#project-files) list (**Repository > Files**). | +| t | Go to the project file search page. (**Repository > Files**, click **Find Files**). | +| g + c | Go to the project commits list (**Repository > Commits**). | +| g + n | Go to the [repository graph](#repository-graph) page (**Repository > Graph**). | +| g + d | Go to repository charts (**Repository > Charts**). | +| g + i | Go to the project issues list (**Issues > List**). | +| i | Go to the New Issue page (**Issues**, click **New Issue** ). | +| g + b | Go to the project issue boards list (**Issues > Boards**). | +| g + m | Go to the project merge requests list (**Merge Requests**). | +| g + j | Go to the CI/CD jobs list (**CI/CD > Jobs**). | +| g + l | Go to the project metrics (**Operations > Metrics**). | +| g + e | Go to the project environments (**Operations > Environments**). | +| g + k | Go to the project Kubernetes cluster integration page (**Operations > Kubernetes**). Note that you must have at least [`maintainer` permissions](../user/permissions.md) to access this page. | +| g + s | Go to the project snippets list (**Snippets**). | +| g + w | Go to the project wiki (**Wiki**), if enabled. | + +### Issues and Merge Requests + +These shortcuts are available when viewing issues and merge requests. + +| Keyboard Shortcut | Description | +| ---------------------------- | ----------- | +| e | Edit description. | +| a | Change assignee. | +| m | Change milestone. | +| l | Change label. | +| r | Start writing a comment. If any text is selected, it will be quoted in the comment. Can't be used to reply within a thread. | +| n | Move to next unresolved discussion (Merge requests only). | +| p | Move to previous unresolved discussion (Merge requests only). | +| ] or j | Move to next file (Merge requests only). | +| [ or k | Move to previous file (Merge requests only). | + +### Project Files + +These shortcuts are available when browsing the files in a project (navigate to +**Repository** > **Files**): | Keyboard Shortcut | Description | | ----------------- | ----------- | -| ↑ | Move selection up | -| ↓ | Move selection down | -| enter | Open selection | -| esc | Go back | +| ↑ | Move selection up. | +| ↓ | Move selection down. | +| enter | Open selection. | +| esc | Go back to file list screen (only while searching for files, **Repository > Files** then click on **Find File**). | +| y | Go to file permalink (only while viewing a file). | -## Global Dashboard +### Web IDE -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| Shift + a | Go to the activity feed | -| Shift + p | Go to projects | -| Shift + i | Go to issues | -| Shift + m | Go to merge requests | -| Shift + t | Go to todos | +These shortcuts are available when editing a file with the [Web IDE](../user/project/web_ide/index.md): -## Project +| Keyboard Shortcut | Description | +| ------------------------------------------------------- | ----------- | +| ⌘ (Mac) / Ctrl + p | Search for, and then open another file for editing. | +| ⌘ (Mac) / Ctrl + Enter | Commit (when editing the commit message). | -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| g + p | Go to the project's home page | -| g + v | Go to the project's activity feed | -| g + f | Go to files | -| g + c | Go to commits | -| g + j | Go to jobs | -| g + n | Go to network graph | -| g + d | Go to repository charts | -| g + i | Go to issues | -| g + b | Go to issue boards | -| g + m | Go to merge requests | -| g + e | Go to environments | -| g + k | Go to kubernetes | -| g + s | Go to snippets | -| g + w | Go to wiki | -| t | Go to finding file | -| i | New issue | - -## Network Graph +### Repository Graph -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| ← or h | Scroll left | -| → or l | Scroll right | -| ↑ or k | Scroll up | -| ↓ or j | Scroll down | -| Shift + ↑ or Shift + k | Scroll to top | -| Shift + ↓ or Shift + j | Scroll to bottom | +These shortcuts are available when viewing the project [repository graph](../user/project/repository/index.md#repository-graph) +page (navigate to **Repository > Graph**): -## Issues and Merge Requests +| Keyboard Shortcut | Description | +| ------------------------------------------------------------------ | ----------- | +| ← or h | Scroll left. | +| → or l | Scroll right. | +| ↑ or k | Scroll up. | +| ↓ or j | Scroll down. | +| Shift + ↑ or Shift + k | Scroll to top. | +| Shift + ↓ or Shift + j | Scroll to bottom. | -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| a | Change assignee | -| m | Change milestone | -| r | Reply (quoting selected text) | -| e | Edit issue/merge request | -| l | Change label | -| ] or j | Move to next file | -| [ or k | Move to previous file | -| n | Move to next unresolved discussion | -| p | Move to previous unresolved discussion | +### Wiki pages -## Epics **(ULTIMATE)** +This shortcut is available when viewing a [wiki page](../user/project/wiki/index.md): | Keyboard Shortcut | Description | | ----------------- | ----------- | -| r | Reply (quoting selected text) | -| e | Edit description | -| l | Change label | - -## Wiki pages +| e | Edit wiki page. | -| Keyboard Shortcut | Description | -| ----------------- | ----------- | -| e | Edit wiki page| +## Epics **(ULTIMATE)** -## Web IDE +These shortcuts are available when viewing [Epics](../user/group/epics/index.md): | Keyboard Shortcut | Description | | ----------------- | ----------- | -| Cmd/Ctrl + p | Go to file | -| Cmd/Ctrl + Enter | Commit (when editing the commit message) | +| r | Start writing a comment. If any text is selected, it will be quoted in the comment. Can't be used to reply within a thread. | +| e | Edit description. | +| l | Change label. | diff --git a/locale/gitlab.pot b/locale/gitlab.pot index d26ce9fa911..f2277dc3446 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -2035,10 +2035,10 @@ msgstr "" msgid "Certificate (PEM)" msgstr "" -msgid "Change Label" +msgid "Change assignee" msgstr "" -msgid "Change assignee" +msgid "Change label" msgstr "" msgid "Change milestone" @@ -3019,6 +3019,9 @@ msgstr "" msgid "Comment is being updated" msgstr "" +msgid "Comment/Reply (quoting selected text)" +msgstr "" + msgid "Comments" msgstr "" @@ -4189,9 +4192,15 @@ msgstr "" msgid "Edit comment" msgstr "" +msgid "Edit description" +msgstr "" + msgid "Edit environment" msgstr "" +msgid "Edit epic description" +msgstr "" + msgid "Edit file" msgstr "" @@ -4204,25 +4213,22 @@ msgstr "" msgid "Edit identity for %{user_name}" msgstr "" -msgid "Edit issue" -msgstr "" - msgid "Edit issues" msgstr "" -msgid "Edit last comment (when focused on an empty textarea)" +msgid "Edit public deploy key" msgstr "" -msgid "Edit merge request" +msgid "Edit stage" msgstr "" -msgid "Edit public deploy key" +msgid "Edit wiki page" msgstr "" -msgid "Edit stage" +msgid "Edit your most recent comment in a thread (from an empty textarea)" msgstr "" -msgid "Edit wiki page" +msgid "Editing" msgstr "" msgid "Email" @@ -4543,6 +4549,9 @@ msgstr "" msgid "Epic" msgstr "" +msgid "Epics (Ultimate / Gold license only)" +msgstr "" + msgid "Error" msgstr "" @@ -5100,9 +5109,6 @@ msgstr "" msgid "Find the newly extracted Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json file." msgstr "" -msgid "Finding Project File" -msgstr "" - msgid "Fingerprint" msgstr "" @@ -5127,12 +5133,6 @@ msgstr "" msgid "FlowdockService|Flowdock is a collaboration web app for technical teams." msgstr "" -msgid "Focus Filter" -msgstr "" - -msgid "Focus Search" -msgstr "" - msgid "FogBugz Email" msgstr "" @@ -5376,6 +5376,9 @@ msgstr "" msgid "Go back" msgstr "" +msgid "Go back (while searching for files" +msgstr "" + msgid "Go back to %{startTag}Open issues%{endTag} and select some issues to add to your board." msgstr "" @@ -5397,16 +5400,17 @@ msgstr "" msgid "Go to file" msgstr "" -msgid "Go to file permalink" +msgid "Go to file (MRs only)" msgstr "" -msgid "Go to files" + +msgid "Go to file permalink (while viewing a file)" msgstr "" -msgid "Go to finding file" +msgid "Go to files" msgstr "" -msgid "Go to groups" +msgid "Go to find file" msgstr "" msgid "Go to issue boards" @@ -5427,45 +5431,60 @@ msgstr "" msgid "Go to metrics" msgstr "" -msgid "Go to milestones" -msgstr "" - -msgid "Go to network graph" -msgstr "" - msgid "Go to parent" msgstr "" msgid "Go to project" msgstr "" -msgid "Go to projects" +msgid "Go to releases" msgstr "" msgid "Go to repository charts" msgstr "" +msgid "Go to repository graph" +msgstr "" + msgid "Go to snippets" msgstr "" msgid "Go to the activity feed" msgstr "" +msgid "Go to the milestone list" +msgstr "" + msgid "Go to the project's activity feed" msgstr "" msgid "Go to the project's overview page" msgstr "" -msgid "Go to todos" +msgid "Go to wiki" msgstr "" -msgid "Go to wiki" +msgid "Go to your To-Do list" msgstr "" msgid "Go to your fork" msgstr "" +msgid "Go to your groups" +msgstr "" + +msgid "Go to your issues" +msgstr "" + +msgid "Go to your merge requests" +msgstr "" + +msgid "Go to your projects" +msgstr "" + +msgid "Go to your snippets" +msgstr "" + msgid "Google Code import" msgstr "" @@ -6233,6 +6252,9 @@ msgstr "" msgid "Issues" msgstr "" +msgid "Issues / Merge Requests" +msgstr "" + msgid "Issues can be bugs, tasks or ideas to be discussed. Also, issues are searchable and filterable." msgstr "" @@ -7254,18 +7276,6 @@ msgstr "" msgid "Move this issue to another project." msgstr "" -msgid "Move to next file" -msgstr "" - -msgid "Move to next unresolved discussion" -msgstr "" - -msgid "Move to previous file" -msgstr "" - -msgid "Move to previous unresolved discussion" -msgstr "" - msgid "MoveIssue|Cannot move issue due to insufficient permissions!" msgstr "" @@ -7326,9 +7336,6 @@ msgstr "" msgid "Network" msgstr "" -msgid "Network Graph" -msgstr "" - msgid "Never" msgstr "" @@ -7451,6 +7458,12 @@ msgstr "" msgid "Next" msgstr "" +msgid "Next file in diff (MRs only)" +msgstr "" + +msgid "Next unresolved discussion (MRs only)" +msgstr "" + msgid "Nickname" msgstr "" @@ -8446,6 +8459,12 @@ msgstr "" msgid "Previous Artifacts" msgstr "" +msgid "Previous file in diff (MRs only)" +msgstr "" + +msgid "Previous unresolved discussion (MRs only)" +msgstr "" + msgid "Prioritize" msgstr "" @@ -8824,10 +8843,7 @@ msgstr "" msgid "Project Badges" msgstr "" -msgid "Project File" -msgstr "" - -msgid "Project Files browsing" +msgid "Project Files" msgstr "" msgid "Project ID" @@ -9621,9 +9637,6 @@ msgstr "" msgid "Replaced all labels with %{label_references} %{label_text}." msgstr "" -msgid "Reply (quoting selected text)" -msgstr "" - msgid "Reply by email" msgstr "" @@ -9672,6 +9685,9 @@ msgstr "" msgid "Repository" msgstr "" +msgid "Repository Graph" +msgstr "" + msgid "Repository Settings" msgstr "" @@ -10499,9 +10515,6 @@ msgstr "" msgid "Show whitespace changes" msgstr "" -msgid "Show/hide this dialog" -msgstr "" - msgid "Showing %d event" msgid_plural "Showing %d events" msgstr[0] "" @@ -10936,6 +10949,9 @@ msgstr "" msgid "Start date" msgstr "" +msgid "Start search" +msgstr "" + msgid "Start the Runner!" msgstr "" @@ -12274,6 +12290,9 @@ msgstr "" msgid "Toggle the Performance Bar" msgstr "" +msgid "Toggle this dialog" +msgstr "" + msgid "Toggle thread" msgstr "" -- cgit v1.2.1