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

diff --cc app/views/layouts/_header.html.erb
index 1f5856908abed577e1a18c580b94a7c679dfeb51,2e5af50b494e44bc012acff747e113a1943e8e6f..f09812972ef31ff234233072891f20a0bb1d4300
--- 1/app/views/layouts/_header.html.erb
--- 2/app/views/layouts/_header.html.erb
+++ b/app/views/layouts/_header.html.erb
@@@ -85,12 -101,10 +85,12 @@@
              <span class='badge count-number'><%= number_with_delimiter(current_user.new_messages.size) %></span>
            <% end %>
            <%= link_to t("users.show.my profile"), current_user, :class => "dropdown-item" %>
-           <%= link_to t("users.show.my settings"), edit_account_path, :class => "dropdown-item" %>
+           <%= link_to t("users.show.my_account"), edit_account_path, :class => "dropdown-item" %>
            <%= link_to t("users.show.my_preferences"), preferences_path, :class => "dropdown-item" %>
            <div class="dropdown-divider"></div>
 -          <%= yield :greeting %>
 +          <% if current_user.home_location? %>
 +            <%= link_to t("layouts.home"), account_home_path, :class => "dropdown-item" %>
 +          <% end %>
            <%= link_to t("layouts.logout"), logout_path(:referer => request.fullpath), :method => "post", :class => "geolink dropdown-item" %>
          </div>
        </div>

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