Merge branch 'refs/heads/feature/3.0.0-pre/accessible-header-tags' into feature/2.4.0/accessibility-master

Conflicts:
	app/views/my/_sidebar.rhtml

app/views/activities/index.html.erb

@@ -41,7 +41,7 @@
 
 <% content_for :sidebar do %>
 <% form_tag({}, :method => :get) do %>
-<h3><%= l(:label_activity) %></h3>
+<h3><%= l(:description_filter) %></h3>
 <p><% @activity.event_types.each do |t| %>
 <%= check_box_tag "show_#{t}", 1, @activity.scope.include?(t) %>
 <label for="show_<%=t%>"><%=l("label_#{t.singularize}_plural")%></label>

app/views/issues/_sidebar.rhtml

@@ -1,4 +1,3 @@
-<h3><%= l(:label_issue_plural) %></h3>
 <%= call_hook(:view_issues_sidebar_issues_bottom) %>
 
 <%= call_hook(:view_issues_sidebar_planning_bottom) %>

app/views/my/_sidebar.rhtml

@@ -3,13 +3,13 @@
 	<%= expand_current_menu %>
 <% end %>
 
-<h3><%=l(:label_my_account)%></h3>
+<h3><%=l(:label_my_account_data)%></h3>
 
 <p><%=l(:field_login)%>: <strong><%= link_to_user(@user, :format => :username) %></strong><br />
 <%=l(:field_created_on)%>: <%= format_time(@user.created_on) %></p>
 
 
-<h4><%= l(:label_feeds_access_key) %></h4>
+<h3><%= l(:label_feeds_access_key) %></h3>
 
 <p>
 <% if @user.rss_token %>
@@ -21,7 +21,7 @@
 </p>
 
 <% if Setting.rest_api_enabled? %>
-<h4><%= l(:label_api_access_key) %></h4>
+<h3><%= l(:label_api_access_key) %></h3>
 <div>
   <%= link_to_function(l(:button_show), "$('api-access-key').toggle();")%>
   <pre id='api-access-key' class='autoscroll'><%= h(@user.api_key) %></pre>

app/views/versions/index.html.erb

@@ -32,7 +32,7 @@
 
 <% content_for :sidebar do %>
 <% form_tag({}, :method => :get) do %>
-<h3><%= l(:label_roadmap) %></h3>
+<h3><%= l(:description_filter) %></h3>
 <% @trackers.each do |tracker| %>
   <label><%= check_box_tag "tracker_ids[]", tracker.id, (@selected_tracker_ids.include? tracker.id.to_s), :id => nil %>
   <%=h tracker.name %></label><br />

app/views/wiki/_sidebar.rhtml

@@ -2,7 +2,7 @@
   <%= textilizable @wiki.sidebar.content, :text %>
 <% end -%>
 
-<h3><%= l(:label_wiki) %></h3>
+<h3><%= l(:label_wiki_navigation) %></h3>
 
 <%= link_to l(:field_start_page), {:action => 'show', :id => nil} %><br />
 <%= link_to l(:label_index_by_title), {:action => 'index'} %><br />

config/locales/de.yml

@@ -500,6 +500,7 @@ de:
   label_home: Hauptseite
   label_my_page: Meine Seite
   label_my_account: Mein Konto
+  label_my_account_data: Meine Kontodaten
   label_my_projects: Meine Projekte
   label_my_page_block: Bereich "Meine Seite"
   label_administration: Administration
@@ -672,6 +673,7 @@ de:
   label_result_plural: Resultate
   label_all_words: Alle Wörter
   label_wiki: Wiki
+  label_wiki_navigation: Wiki Navigation
   label_wiki_edit: Wiki-Bearbeitung
   label_wiki_edit_plural: Wiki-Bearbeitungen
   label_wiki_page: Wiki-Seite

config/locales/en.yml

@@ -498,6 +498,7 @@ en:
   label_home: Home
   label_my_page: My page
   label_my_account: My account
+  label_my_account_data: My account data
   label_my_projects: My projects
   label_my_page_block: My page block
   label_administration: Administration
@@ -672,6 +673,7 @@ en:
   label_result_plural: Results
   label_all_words: All words
   label_wiki: Wiki
+  label_wiki_navigation: Wiki navigation
   label_wiki_edit: Wiki edit
   label_wiki_edit_plural: Wiki edits
   label_wiki_page: Wiki page