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

[rails.git] / app / views / trace / list.html.erb

diff --git a/app/views/trace/list.html.erb b/app/views/trace/list.html.erb
index cd72ee406f2ad2e6d00a18e7ded0cf11866e7b93..7dcfacb809cee05d56ad18f941cdfa9de170a5b0 100644 (file)
--- a/app/views/trace/list.html.erb
+++ b/app/views/trace/list.html.erb
@@ -6,19 +6,19 @@
     <li><%= link_to t('trace.trace_header.upload_trace'), :action => 'create' %></li>
     <% if @tag %>
       <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
-      <li><%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
+      <li><%= link_to t('trace.trace_header.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %></li>
     <% else %>
       <% if @display_name %>
         <li><%= link_to t('trace.trace_header.see_all_traces'), :controller => 'trace', :action => 'list', :display_name => nil, :tag => nil, :page => nil %></li>
       <% end %>
       <%= unless_user(@target_user, :li) do %>
-        <%= link_to t('trace.trace_header.see_your_traces'), :action => 'mine', :tag => nil, :page => nil %>
+        <%= link_to t('trace.trace_header.see_my_traces'), :action => 'mine', :tag => nil, :page => nil %>
       <% end %>
     <% end %>
   </ul>
 <% end %>
 
-<% content_for :head do %>
+<% content_for :auto_discovery_link_tag do %>
 <%= auto_discovery_link_tag :rss, :action => 'georss', :display_name => @display_name, :tag => @tag %>
 <% end %>