Merge 18123:18249 from trunk.

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

diff --cc app/views/user/new.html.erb
index 83edc9b89ad5a18962b68122e8aaa95a8f2cf492,a25097e16ca11a03bfcdaea4a9bdf95258439a63..88a1d7bf9e3508fb1e6c5b3ee3b887a3ea0d64a9
--- 1/app/views/user/new.html.erb
--- 2/app/views/user/new.html.erb
+++ b/app/views/user/new.html.erb
@@@ -24,9 -24,10 +24,10 @@@
    <tr><td class="fieldName"><%= t 'user.new.email address' %></td><td><%= text_field('user', 'email',{:size => 50, :maxlength => 255, :tabindex => 1}) %></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.confirm email address' %></td><td><%= text_field('user', 'email_confirmation',{:size => 50, :maxlength => 255, :tabindex => 2}) %></td></tr>
    <tr><td></td><td><span class="minorNote"><%= t 'user.new.not displayed publicly' %></span></td></tr>
 -  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
 +  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.display name' %></td><td><%= text_field('user', 'display_name',{:size => 30, :maxlength => 255, :tabindex => 3}) %></td></tr>
 -  <tr><td colspan=2>&nbsp;<!--vertical spacer--></td></tr>
+   <tr><td></td><td><span class="minorNote"><%= t 'user.new.display name description' %></span></td></tr>
 +  <tr><td colspan="2">&nbsp;<!--vertical spacer--></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.password' %></td><td><%= password_field('user', 'pass_crypt',{:size => 30, :maxlength => 255, :tabindex => 4}) %></td></tr>
    <tr><td class="fieldName"><%= t 'user.new.confirm password' %></td><td><%= password_field('user', 'pass_crypt_confirmation',{:size => 30, :maxlength => 255, :tabindex => 5}) %></td></tr>