Merge remote-tracking branch 'origin/release/6.0' into dev

app/views/roles/index.html.erb

@@ -20,8 +20,12 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 <% html_title l(:label_administration), l("label_role_plural") %>
 <%= toolbar title: Role.model_name.human(count: 2) do %>
   <li class="toolbar-item">
-    <%= link_to({ action: 'new'}, class: 'button -alt-highlight') do %>
-      <i class="button--icon icon-add"></i> <%= l(:label_role_new) %>
+    <%= link_to({ action: 'new'},
+          { class: 'button -alt-highlight',
+            aria: {label: t(:label_role_new)},
+            title: t(:label_role_new)}) do %>
+      <i class="button--icon icon-add"></i>
+      <span class="button--text"><%= Role.model_name.human %></span>
     <% end %>
   </li>
 <% end %>