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

.travis.yml

@@ -91,7 +91,9 @@ before_install:
   - git checkout openproject/$TRAVIS_BRANCH
 
   # End of custom plugin instructions.
-
+  - "rvm @default,@global do gem uninstall bundler -a -x"
+  - gem install bundler -v 1.12.5
+  - echo `bundle -v`
   - "echo `firefox -v`"
   - "export DISPLAY=:99.0"
   - "/sbin/start-stop-daemon --start -v --pidfile ./tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1920x1080x16"

app/views/meetings/index.html.erb

@@ -23,9 +23,13 @@ See doc/COPYRIGHT.md for more details.
 
 <%= toolbar title: l(:label_meeting_plural) do %>
   <% if authorize_for(:meetings, :new) %>
-      <a href="<%= new_meeting_path %>" id="add-meeting-button" title="Add meeting" class="button -alt-highlight">
+      <a href="<%= new_meeting_path %>"
+         id="add-meeting-button"
+         title="<%= I18n.t(:label_meeting_new) %>"
+         arial-label="<%= I18n.t(:label_meeting_new) %>"
+         class="button -alt-highlight">
         <i class="button--icon icon-add"></i>
-        <span class="button--text"><%= I18n.t(:label_meeting_new) %></span>
+        <span class="button--text"><%= t(:label_meeting) %></span>
       </a>
   <% end %>
 <% end %>