Merge remote-tracking branch 'upstream/pull/1857'

diff --combined app/views/user/view.html.erb
index cc4bbf8a6f2c1925a850440cc4a50ef4bead35be,f794b5e717d581d706158d55c9e406f09bffdd6e..3a09165b9d34ba8eafadfb0a5ddc96becc2352b4
--- 1/app/views/user/view.html.erb
--- 2/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@@ -14,7 -14,7 +14,7 @@@
              <%= link_to t('.my notes'), :controller => 'notes', :action=> 'mine' %>
            </li>
            <li>
-             <%= link_to t('.my traces'), :controller => 'trace', :action=>'mine' %>
+             <%= link_to t('.my traces'), :controller => 'traces', :action => 'mine' %>
              <span class='count-number'><%= number_with_delimiter(current_user.traces.size) %></span>
            </li>
            <li>
@@@ -56,14 -56,14 +56,14 @@@
              <%= link_to t('.notes'), :controller => 'notes', :action=> 'mine' %>
            </li>
            <li>
-             <%= link_to t('.traces'), :controller => 'trace', :action => 'list', :display_name => @user.display_name %>
+             <%= link_to t('.traces'), :controller => 'traces', :action => 'list', :display_name => @user.display_name %>
              <span class='count-number'><%= number_with_delimiter(@user.traces.size) %></span>
            </li>
  
            <!-- Displaying another user's profile page -->
  
            <li>
 -            <%= link_to t('.send message'), :controller => 'message', :action => 'new', :display_name => @user.display_name %>
 +            <%= link_to t('.send message'), new_message_path(@user) %>
            </li>
            <li>
              <%= link_to t('.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @user.display_name %>