diff options
| author | Filipa Lacerda <filipa@gitlab.com> | 2017-09-28 11:07:05 +0000 |
|---|---|---|
| committer | Filipa Lacerda <filipa@gitlab.com> | 2017-09-28 11:07:05 +0000 |
| commit | 7689c3ec88eab153a1b4d8e6f8ac45df35231e1e (patch) | |
| tree | 6153ab785ecf69f9d98ee39ba5d0971cba972f97 | |
| parent | afb1e004fc8e342056e0ef93f78d6460cba67762 (diff) | |
| parent | cfea8f796fa48fd0a03d084c6c2cb3aa66398bdf (diff) | |
| download | gitlab-ce-7689c3ec88eab153a1b4d8e6f8ac45df35231e1e.tar.gz | |
Merge branch 'fix-translation-namespaces' into 'master'
Fixed missing namespaces on navigation translations
See merge request gitlab-org/gitlab-ce!14472
| -rw-r--r-- | app/helpers/boards_helper.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/artifacts/browse.html.haml | 2 | ||||
| -rw-r--r-- | locale/gitlab.pot | 14 |
3 files changed, 9 insertions, 9 deletions
diff --git a/app/helpers/boards_helper.rb b/app/helpers/boards_helper.rb index 62ac208f16a..7112c6ee470 100644 --- a/app/helpers/boards_helper.rb +++ b/app/helpers/boards_helper.rb @@ -79,6 +79,6 @@ module BoardsHelper end def boards_link_text - _("Board") + s_("IssueBoards|Board") end end diff --git a/app/views/projects/artifacts/browse.html.haml b/app/views/projects/artifacts/browse.html.haml index 05857573297..fe02cbcbf95 100644 --- a/app/views/projects/artifacts/browse.html.haml +++ b/app/views/projects/artifacts/browse.html.haml @@ -3,7 +3,7 @@ = render "projects/jobs/header", show_controls: false -- add_to_breadcrumbs(_('Jobs'), project_jobs_path(@project)) +- add_to_breadcrumbs(s_('CICD|Jobs'), project_jobs_path(@project)) - add_to_breadcrumbs("##{@build.id}", project_jobs_path(@project)) .tree-holder diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 3a45b386ee1..600432be3bf 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: gitlab 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-09-27 11:10+0100\n" -"PO-Revision-Date: 2017-09-27 11:10+0100\n" +"POT-Creation-Date: 2017-09-27 15:43+0100\n" +"PO-Revision-Date: 2017-09-27 15:43+0100\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" "Language: \n" @@ -158,9 +158,6 @@ msgstr "" msgid "AutoDevOps|Learn more in the %{link_to_documentation}" msgstr "" -msgid "Board" -msgstr "" - msgid "Branch" msgid_plural "Branches" msgstr[0] "" @@ -274,6 +271,9 @@ msgstr "" msgid "CI configuration" msgstr "" +msgid "CICD|Jobs" +msgstr "" + msgid "Cancel" msgstr "" @@ -691,10 +691,10 @@ msgstr "" msgid "Issue events" msgstr "" -msgid "Issues" +msgid "IssueBoards|Board" msgstr "" -msgid "Jobs" +msgid "Issues" msgstr "" msgid "LFSStatus|Disabled" |