Merge branch 'master' of https://github.com/TravisSpangle/redmine_spent_time_in_issue_description

Conflicts:
	config/locales/en.yml
	config/locales/fr.yml

Author: travis

app/views/spent_time/_report.html.erb

@@ -1,6 +1,6 @@
 <% if User.current.allowed_to?(:view_time_entries, @project) and @issue.time_entries.present? %>
   <hr />
-  <p><strong><%= t('plugin_spent_time_in_issue.timeEntries') %></strong> <%= link_to "see all #{@issue.time_entries.count} entries", project_issue_time_entries_path( @project , @issue ) if @issue.time_entries.count > Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i %> </p>
+  <p><strong><%= t('plugin_spent_time_in_issue.timeEntries') %></strong> (<%= link_to "#{t "plugin_spent_time_in_issue.seeAllCount", count: @issue.time_entries.count}", project_issue_time_entries_path( @project , @issue ) if @issue.time_entries.count > Setting.plugin_redmine_spent_time_in_issue_description['spent_time_max_display'].to_i %>) </p>
 
   <table class="issue-spent-time-description">
     <thead>

config/locales/en.yml

@@ -6,5 +6,9 @@ en:
         user: User
         hours: Hours
         comments: Comments
+<<<<<<< HEAD
         display_cols: Display Columns
         activity: Activity
+=======
+        seeAllCount: See all %{count} entries
+>>>>>>> FETCH_HEAD

config/locales/fr.yml

@@ -6,5 +6,9 @@ fr:
         user: Utilisateur
         hours: Nombre d'heures
         comments: Commentaires
+<<<<<<< HEAD
         display_cols: Afficher des colonnes
         activity: Activité
+=======
+        seeAllCount: Voir les %{count} entrées
+>>>>>>> FETCH_HEAD