Merge remote-tracking branch 'tomzx/b552_hardcoded_english_string'

Conflicts:
	app/helpers/repositories_helper.rb

app/helpers/repositories_helper.rb

@@ -99,7 +99,7 @@ module RepositoriesHelper
                              :path => path_param,
                              :rev => @changeset.identifier) unless c.action == 'D'
         text << " - #{h(c.revision)}" unless c.revision.blank?
-        text << ' (' + link_to('diff', :controller => 'repositories',
+        text << ' (' + link_to(l(:label_diff), :controller => 'repositories',
                                        :action => 'diff',
                                        :id => @project,
                                        :path => path_param,

app/views/wiki/show.rhtml

@@ -17,7 +17,7 @@
     <p>
     <%= link_to(('&#171; ' + l(:label_previous)), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version - 1)) + " - " if @content.version > 1 %>
     <%= "#{l(:label_version)} #{@content.version}/#{@page.content.version}" %>
-    <%= '(' + link_to('diff', :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> -
+    <%= '(' + link_to(l(:label_diff), :controller => 'wiki', :action => 'diff', :id => @page.title, :project_id => @page.project, :version => @content.version) + ')' if @content.version > 1 %> -
     <%= link_to((l(:label_next) + ' &#187;'), :action => 'show', :id => @page.title, :project_id => @page.project, :version => (@content.version + 1)) + " - " if @content.version < @page.content.version %>
     <%= link_to(l(:label_current_version), :action => 'show', :id => @page.title, :project_id => @page.project) %>
     <br />

config/locales/en.yml

@@ -678,6 +678,7 @@ en:
   label_statistics: Statistics
   label_commits_per_month: Commits per month
   label_commits_per_author: Commits per author
+  label_diff: diff
   label_view_diff: View differences
   label_diff_inline: inline
   label_diff_side_by_side: side by side

config/locales/fr.yml

@@ -672,6 +672,7 @@ fr:
   label_statistics: Statistiques
   label_commits_per_month: Commits par mois
   label_commits_per_author: Commits par auteur
+  label_diff: diff
   label_view_diff: Voir les différences
   label_diff_inline: en ligne
   label_diff_side_by_side: côte à côte