EE port of fix-translation-namespaces

app/helpers/boards_helper.rb

@@ -81,6 +81,6 @@ module BoardsHelper
   end
 
   def boards_link_text
-    _("Board")
+    s_("IssueBoards|Board")
   end
 end

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

ee/app/helpers/ee/boards_helper.rb

@@ -57,9 +57,9 @@ module EE
 
     def boards_link_text
       if @project.multiple_issue_boards_available?(current_user)
-        "Boards"
+        s_("IssueBoards|Boards")
       else
-        "Board"
+        s_("IssueBoards|Board")
       end
     end
   end

locale/gitlab.pot

@@ -8,8 +8,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gitlab 1.0.0\n"
 "Report-Msgid-Bugs-To: \n"
+<<<<<<< HEAD
 "POT-Creation-Date: 2017-09-27 16:26+0200\n"
 "PO-Revision-Date: 2017-09-27 16:26+0200\n"
+=======
+"POT-Creation-Date: 2017-09-26 16:01+0100\n"
+"PO-Revision-Date: 2017-09-26 16:01+0100\n"
+>>>>>>> EE port of fix-translation-namespaces
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -83,12 +88,18 @@ msgstr ""
 msgid "Activity"
 msgstr ""
 
+msgid "Add"
+msgstr ""
+
 msgid "Add Changelog"
 msgstr ""
 
 msgid "Add Contribution guide"
 msgstr ""
 
+msgid "Add Group Webhooks and GitLab Enterprise Edition."
+msgstr ""
+
 msgid "Add License"
 msgstr ""
 
@@ -207,9 +218,12 @@ msgid "BillingPlans|per user"
 msgstr ""
 
 msgid "Billinglans|Downgrade"
+<<<<<<< HEAD
 msgstr ""
 
 msgid "Board"
+=======
+>>>>>>> EE port of fix-translation-namespaces
 msgstr ""
 
 msgid "Branch"
@@ -334,12 +348,18 @@ msgstr ""
 msgid "CI configuration"
 msgstr ""
 
+msgid "CICD|Jobs"
+msgstr ""
+
 msgid "Cancel"
 msgstr ""
 
 msgid "Cancel edit"
 msgstr ""
 
+msgid "Change Weight"
+msgstr ""
+
 msgid "ChangeTypeActionLabel|Pick into branch"
 msgstr ""
 
@@ -421,6 +441,9 @@ msgstr ""
 msgid "CiStatus|running"
 msgstr ""
 
+msgid "Close"
+msgstr ""
+
 msgid "Comments"
 msgstr ""
 
@@ -557,6 +580,9 @@ msgstr ""
 msgid "Description"
 msgstr ""
 
+msgid "Description templates allow you to define context-specific templates for issue and merge request description fields for your project."
+msgstr ""
+
 msgid "Details"
 msgstr ""
 
@@ -566,6 +592,9 @@ msgstr ""
 msgid "Discard changes"
 msgstr ""
 
+msgid "Dismiss Merge Request promotion"
+msgstr ""
+
 msgid "Don't show again"
 msgstr ""
 
@@ -742,6 +771,15 @@ msgstr ""
 msgid "Import repository"
 msgstr ""
 
+msgid "Improve Issue boards with GitLab Enterprise Edition."
+msgstr ""
+
+msgid "Improve issues management with Issue weight and GitLab Enterprise Edition."
+msgstr ""
+
+msgid "Improve search with Advanced Global Search and GitLab Enterprise Edition."
+msgstr ""
+
 msgid "Install a Runner compatible with GitLab CI"
 msgstr ""
 
@@ -751,13 +789,22 @@ msgstr ""
 msgid "Introducing Cycle Analytics"
 msgstr ""
 
+msgid "Issue board focus mode"
+msgstr ""
+
+msgid "Issue boards with milestones"
+msgstr ""
+
 msgid "Issue events"
 msgstr ""
 
-msgid "Issues"
+msgid "IssueBoards|Board"
 msgstr ""
 
-msgid "Jobs"
+msgid "IssueBoards|Boards"
+msgstr ""
+
+msgid "Issues"
 msgstr ""
 
 msgid "LFSStatus|Disabled"
@@ -839,6 +886,9 @@ msgstr ""
 msgid "More information is available|here"
 msgstr ""
 
+msgid "Multiple issue boards"
+msgstr ""
+
 msgid "New Issue"
 msgid_plural "New Issues"
 msgstr[0] ""
@@ -877,6 +927,9 @@ msgstr ""
 msgid "No schedules"
 msgstr ""
 
+msgid "None"
+msgstr ""
+
 msgid "Not available"
 msgstr ""
 
@@ -1418,6 +1471,12 @@ msgstr ""
 msgid "Team"
 msgstr ""
 
+msgid "Thanks! Don't show me this again"
+msgstr ""
+
+msgid "The Advanced Global Search in GitLab is a powerful search service that saves you time. Instead of creating duplicate code and wasting time, you can now search for code within other teams that can help your own project."
+msgstr ""
+
 msgid "The coding stage shows the time from the first commit to creating the merge request. The data will automatically be added here once you create your first merge request."
 msgstr ""
 
@@ -1629,9 +1688,27 @@ msgstr ""
 msgid "Total test time for all commits/merges"
 msgstr ""
 
+msgid "Track activity with Contribution Analytics."
+msgstr ""
+
 msgid "Unstar"
 msgstr ""
 
+msgid "Upgrade your plan to activate Advanced Global Search."
+msgstr ""
+
+msgid "Upgrade your plan to activate Contribution Analytics."
+msgstr ""
+
+msgid "Upgrade your plan to activate Group Webhooks."
+msgstr ""
+
+msgid "Upgrade your plan to activate Issue weight."
+msgstr ""
+
+msgid "Upgrade your plan to improve Issue boards."
+msgstr ""
+
 msgid "Upload New File"
 msgstr ""
 
@@ -1674,9 +1751,18 @@ msgstr ""
 msgid "We don't have enough data to show this stage."
 msgstr ""
 
+msgid "Webhooks allow you to trigger a URL if, for example, new code is pushed or a new issue is created. You can configure webhooks to listen for specific events like pushes, issues or merge requests. Group webhooks will apply to all projects in a group, allowing you to standardize webhook functionality across your entire group."
+msgstr ""
+
+msgid "Weight"
+msgstr ""
+
 msgid "Wiki"
 msgstr ""
 
+msgid "With contribution analytics you can have an overview for the activity of issues, merge requests and push events of your organization and its members."
+msgstr ""
+
 msgid "Withdraw Access Request"
 msgstr ""
 
@@ -1749,3 +1835,6 @@ msgid "parent"
 msgid_plural "parents"
 msgstr[0] ""
 msgstr[1] ""
+
+msgid "to help your contributors communicate effectively!"
+msgstr ""