Merged r11582 from trunk (#13337).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@11583 e93f8b46-1217-0410-a6f0-8f06a7374b81

53 files changed, 62 insertions, 14 deletions

diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index f6bdba2ec..cf5629f52 100644
--- a/app/helpers/timelog_helper.rb
+++ b/app/helpers/timelog_helper.rb
@@ -107,14 +107,14 @@ module TimelogHelper
       # Column headers
       headers = report.criteria.collect {|criteria| l(report.available_criteria[criteria][:label]) }
       headers += report.periods
-      headers << l(:label_total)
+      headers << l(:label_total_time)
       csv << headers.collect {|c| Redmine::CodesetUtil.from_utf8(
                                     c.to_s,
                                     l(:general_csv_encoding) ) }
       # Content
       report_criteria_to_csv(csv, report.available_criteria, report.columns, report.criteria, report.periods, report.hours)
       # Total row
-      str_total = Redmine::CodesetUtil.from_utf8(l(:label_total), l(:general_csv_encoding))
+      str_total = Redmine::CodesetUtil.from_utf8(l(:label_total_time), l(:general_csv_encoding))
       row = [ str_total ] + [''] * (report.criteria.size - 1)
       total = 0
       report.periods.each do |period|
diff --git a/app/views/my/blocks/_timelog.html.erb b/app/views/my/blocks/_timelog.html.erb
index 0e0e6142f..be8e05e35 100644
--- a/app/views/my/blocks/_timelog.html.erb
+++ b/app/views/my/blocks/_timelog.html.erb
@@ -5,7 +5,7 @@ entries_by_day = entries.group_by(&:spent_on)
 %>
 
 <div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
+<p><%= l(:label_total_time) %>: <%= html_hours("%.2f" % entries.sum(&:hours).to_f) %></p>
 </div>
 
 <% if entries.any? %>
diff --git a/app/views/timelog/index.html.erb b/app/views/timelog/index.html.erb
index e1fa5b26e..35ddf8121 100644
--- a/app/views/timelog/index.html.erb
+++ b/app/views/timelog/index.html.erb
@@ -13,7 +13,7 @@
 <% end %>
 
 <div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours(l_hours(@total_hours)) %></p>
+<p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@total_hours)) %></p>
 </div>
 
 <% unless @entries.empty? %>
diff --git a/app/views/timelog/report.html.erb b/app/views/timelog/report.html.erb
index 4b9f0befe..d88ee782a 100644
--- a/app/views/timelog/report.html.erb
+++ b/app/views/timelog/report.html.erb
@@ -30,7 +30,7 @@
 
 <% unless @report.criteria.empty? %>
 <div class="total-hours">
-<p><%= l(:label_total) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
+<p><%= l(:label_total_time) %>: <%= html_hours(l_hours(@report.total_hours)) %></p>
 </div>
 
 <% unless @report.hours.empty? %>
@@ -45,13 +45,13 @@
 <% @report.periods.each do |period| %>
   <th class="period" width="<%= columns_width %>%"><%= period %></th>
 <% end %>
-  <th class="total" width="<%= columns_width %>%"><%= l(:label_total) %></th>
+  <th class="total" width="<%= columns_width %>%"><%= l(:label_total_time) %></th>
 </tr>
 </thead>
 <tbody>
 <%= render :partial => 'report_criteria', :locals => {:criterias => @report.criteria, :hours => @report.hours, :level => 0} %>
   <tr class="total">
-  <td><%= l(:label_total) %></td>
+  <td><%= l(:label_total_time) %></td>
   <%= ('<td></td>' * (@report.criteria.size - 1)).html_safe %>
   <% total = 0 -%>
   <% @report.periods.each do |period| -%>
diff --git a/config/locales/ar.yml b/config/locales/ar.yml
index 3391cd1c5..52e49492b 100644
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1086,3 +1086,4 @@ ar:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: الإجمالي
diff --git a/config/locales/az.yml b/config/locales/az.yml
index 194f3e8e7..901df1976 100644
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1183,3 +1183,4 @@ az:
   label_cross_project_tree: With project tree
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Cəmi
diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index 42210ed7d..f70f45a8c 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1083,3 +1083,4 @@ bg:
   description_date_from: Въведете начална дата
   description_date_to: Въведете крайна дата
   text_repository_identifier_info: 'Позволени са малки букви (a-z), цифри, тирета и _.<br />Промяна след създаването му не е възможна.'
+  label_total_time: Общо
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 0304c3432..cec979ee4 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1099,3 +1099,4 @@ bs:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Ukupno
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 7770fbd48..e01b7dcbf 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1088,3 +1088,4 @@ ca:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 69b9871df..9ef748522 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1090,3 +1090,4 @@ cs:
   field_inherit_members: Zdědit členy
   field_closed_on: Uzavřeno
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Celkem
diff --git a/config/locales/da.yml b/config/locales/da.yml
index c3c18a6c0..1cdc4d4cd 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1103,3 +1103,4 @@ da:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 8b1b89449..d21dc9b8a 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1098,3 +1098,4 @@ de:
   version_status_open: offen
 
   warning_attachments_not_saved: "%{count} Datei(en) konnten nicht gespeichert werden."
+  label_total_time: Gesamtzeit
diff --git a/config/locales/el.yml b/config/locales/el.yml
index 638e13353..f122dd058 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1086,3 +1086,4 @@ el:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Σύνολο
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index f9f570fb7..d1dafe679 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1088,3 +1088,4 @@ en-GB:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 2470cff52..ba16af6ed 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -618,6 +618,7 @@ en:
     one:   1 issue
     other: "%{count} issues"
   label_total: Total
+  label_total_time: Total time
   label_permissions: Permissions
   label_current_status: Current status
   label_new_statuses_allowed: New statuses allowed
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 4f8d54ece..2ec4fef2a 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1122,3 +1122,4 @@ es:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/et.yml b/config/locales/et.yml
index c09a776ec..0764b47c4 100644
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1099,3 +1099,4 @@ et:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: "Kokku"
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index edb560c17..5518d4be5 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1087,3 +1087,4 @@ eu:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Guztira
diff --git a/config/locales/fa.yml b/config/locales/fa.yml
index c5afa9066..a70578876 100644
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1088,3 +1088,4 @@ fa:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: جمله
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index 7997a2bfd..e05aa6ef2 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1107,3 +1107,4 @@ fi:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Yhteensä
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 439e3b1df..dcd8cf154 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -612,6 +612,7 @@ fr:
     one:   1 demande
     other: "%{count} demandes"
   label_total: Total
+  label_total_time: Temps total
   label_permissions: Permissions
   label_current_status: Statut actuel
   label_new_statuses_allowed: Nouveaux statuts autorisés
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index d36e3367f..bf0d742a4 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1097,3 +1097,4 @@ gl:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 59d1fe292..83e1ec953 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1091,3 +1091,4 @@ he:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: סה"כ
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 5803569b9..007c9fa09 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1087,3 +1087,4 @@ hr:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Ukupno
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 1a7850e48..2544bd77d 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1105,3 +1105,4 @@
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Összesen
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 9312af84f..248e687bc 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1090,3 +1090,4 @@ id:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 1769db613..5ea2631ab 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1087,3 +1087,4 @@ it:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Totale
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index f0caa5738..bbf975459 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1115,3 +1115,4 @@ ja:
   setting_jsonp_enabled: JSONPを有効にする
   field_inherit_members: メンバーを継承
   field_closed_on: 終了日
+  label_total_time: 合計
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index b0290dcfa..5f688820b 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1136,3 +1136,4 @@ ko:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: 합계
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index 89e3d07fb..1159854f7 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1145,3 +1145,4 @@ lt:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Iš viso
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index ec9ee666d..4dddbf0b4 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1080,3 +1080,4 @@ lv:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Kopā
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index 066b484f4..f8afade89 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1086,3 +1086,4 @@ mk:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Вкупно
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 67fea4ca2..d3eb70ec9 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1087,3 +1087,4 @@ mn:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Нийт
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index f22304e88..cbaea2e20 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1068,3 +1068,4 @@ nl:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Totaal
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 2e880f229..e2249c594 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1076,3 +1076,4 @@
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Totalt
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index 3cb895a59..ff6eff31a 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1107,3 +1107,4 @@ pl:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Ogółem
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 9d2793ea0..c305083ba 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1106,3 +1106,4 @@ pt-BR:
   field_inherit_members: Herdar membros
   field_closed_on: Fechado
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 1c60e5f87..5deff0a68 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1092,3 +1092,4 @@ pt:
   field_inherit_members: Herdar membros
   field_closed_on: Fechado
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index fcadde6fb..ef7f0854f 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1081,3 +1081,4 @@ ro:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index a6f6c2fdf..4e08f6549 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1196,3 +1196,4 @@ ru:
   field_inherit_members: Наследовать участников
   field_closed_on: Закрыта
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Общее время
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 5fcd5c8f4..b9b4d6a0c 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1083,3 +1083,4 @@ sk:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Celkovo
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index e531ca8e2..8c6e22b40 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1086,3 +1086,4 @@ sl:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Skupaj
diff --git a/config/locales/sq.yml b/config/locales/sq.yml
index 411c6b563..3336181c5 100644
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1082,3 +1082,4 @@ sq:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 781909f25..86590627a 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1088,3 +1088,4 @@ sr-YU:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Ukupno
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index cf3447f63..c06be94d4 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1087,3 +1087,4 @@ sr:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Укупно
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 54f2cbf7f..b44b566b0 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1124,3 +1124,4 @@ sv:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Total
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 90d6e15ad..326a261a6 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1083,3 +1083,4 @@ th:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: จำนวนรวม
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 7ac7b3ed5..383b0b889 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1105,3 +1105,4 @@ tr:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Toplam
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index bb2b7e491..821ec254b 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1081,3 +1081,4 @@ uk:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Всього
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index e71350126..8703db8e6 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1139,3 +1139,4 @@ vi:
   field_inherit_members: Các thành viên kế thừa
   field_closed_on: Đã đóng
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: Tổng cộng
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index da6a45c90..ee00add32 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1166,3 +1166,4 @@
   description_date_to: 輸入結束日期
   text_repository_identifier_info: '僅允許使用小寫英文字母 (a-z), 阿拉伯數字, 虛線與底線。<br />一旦儲存之後, 代碼便無法再次被更改。'
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: 總計
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 543596fc0..cb358c25a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1090,3 +1090,4 @@ zh:
   field_inherit_members: Inherit members
   field_closed_on: Closed
   setting_default_projects_tracker_ids: Default trackers for new projects
+  label_total_time: 合计
diff --git a/test/functional/time_entry_reports_controller_test.rb b/test/functional/time_entry_reports_controller_test.rb
index 76013614e..755cdc345 100644
--- a/test/functional/time_entry_reports_controller_test.rb
+++ b/test/functional/time_entry_reports_controller_test.rb
@@ -140,7 +140,7 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
       assert_select 'th:nth-child(2)', :text => '2009-52'
       assert_select 'th:nth-child(3)', :text => '2009-53'
       assert_select 'th:nth-child(4)', :text => '2010-1'
-      assert_select 'th:nth-child(5)', :text => 'Total'
+      assert_select 'th:nth-child(5)', :text => 'Total time'
     end
     assert_select '#time-report tbody tr' do
       assert_select 'td:nth-child(1)', :text => 'eCookbook'
@@ -206,9 +206,9 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
     assert_equal 'text/csv; header=present', @response.content_type
     lines = @response.body.chomp.split("\n")
     # Headers
-    assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
+    assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
     # Total row
-    assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
+    assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
   end
 
   def test_report_csv_export
@@ -219,9 +219,9 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
     assert_equal 'text/csv; header=present', @response.content_type
     lines = @response.body.chomp.split("\n")
     # Headers
-    assert_equal 'Project,User,Activity,2007-3,2007-4,Total', lines.first
+    assert_equal 'Project,User,Activity,2007-3,2007-4,Total time', lines.first
     # Total row
-    assert_equal 'Total,"","",154.25,8.65,162.90', lines.last
+    assert_equal 'Total time,"","",154.25,8.65,162.90', lines.last
   end
 
   def test_csv_big_5
@@ -348,8 +348,8 @@ class TimeEntryReportsControllerTest < ActionController::TestCase
       assert_equal 'text/csv; header=present', @response.content_type
       lines = @response.body.chomp.split("\n")    
       # Headers
-      s1 = "Utilisateur;2011-11-11;Total"
-      s2 = "Total"
+      s1 = "Utilisateur;2011-11-11;Temps total"
+      s2 = "Temps total"
       if s1.respond_to?(:force_encoding)
         s1.force_encoding('ISO-8859-1')
         s2.force_encoding('ISO-8859-1')