merge 15807:16012 from rails_port

diff --cc app/views/changeset/_changeset.html.erb
Simple merge

diff --cc app/views/layouts/site.html.erb
Simple merge

diff --cc app/views/user/view.html.erb
index 6e54fbebb06b68256026f0e79f35e6cbba967140,5fdea140ff614bec8fe5a7088a5530a4bd4af8d6..0dbc09dd3484f0f9580f39f1e9a0ce476dcfaf33
--- 1/app/views/user/view.html.erb
--- 2/app/views/user/view.html.erb
+++ b/app/views/user/view.html.erb
@@@ -9,9 -9,9 +9,9 @@@
  | <%= link_to t('user.view.my settings'), :controller => 'user', :action => 'account', :display_name => @user.display_name %>
  <% else %>
  <!-- Displaying another user's profile page -->
- <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :user_id => @this_user.id %>
+ <%= link_to t('user.view.send message'), :controller => 'message', :action => 'new', :display_name => @this_user.display_name %>
  | <%= link_to t('user.view.diary'), :controller => 'diary_entry', :action => 'list', :display_name => @this_user.display_name %>
 -| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list_user', :display_name => @this_user.display_name %>
 +| <%= link_to t('user.view.edits'), :controller => 'changeset', :action => 'list', :display_name => @this_user.display_name %>
  | <%= link_to t('user.view.traces'), :controller => 'trace', :action => 'view', :display_name => @this_user.display_name %>
  | <% if @user and @user.is_friends_with?(@this_user) %>
    <%= link_to t('user.view.remove as friend'), :controller => 'user', :action => 'remove_friend', :display_name => @this_user.display_name %>

diff --cc config/locales/en.yml
Simple merge

diff --cc config/routes.rb
Simple merge