Automatic merge of gitlab-org/gitlab-ce master

app/views/shared/_sidebar_toggle_button.html.haml

 %a.toggle-sidebar-button.js-toggle-sidebar{ role: "button", type: "button", title: "Toggle sidebar" }
   = sprite_icon('angle-double-left', css_class: 'icon-angle-double-left')
   = sprite_icon('angle-double-right', css_class: 'icon-angle-double-right')
-  %span.collapse-text Collapse sidebar
+  %span.collapse-text= _("Collapse sidebar")
 
 = button_tag class: 'close-nav-button', type: 'button' do
   = sprite_icon('close', size: 16)
-  %span.collapse-text Close sidebar
+  %span.collapse-text= _("Close sidebar")

doc/development/i18n/externalization.md

@@ -300,7 +300,7 @@ file in. Once the changes are on master, they will be picked up by
 [Crowdin](http://translate.gitlab.com) and be presented for translation.
 
 If there are merge conflicts in the `gitlab.pot` file, you can delete the file
-and regenerate it using the same command. Confirm that you are not deleting any strings accidentally by looking over the diff.
+and regenerate it using the same command.
 
 ### Validating PO files
 

locale/gitlab.pot

@@ -2415,6 +2415,9 @@ msgstr ""
 msgid "Close milestone"
 msgstr ""
 
+msgid "Close sidebar"
+msgstr ""
+
 msgid "Closed"
 msgstr ""