Adds label_total_time string (#13337).

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@11582 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/helpers/timelog_helper.rb b/app/helpers/timelog_helper.rb
index f6bdba2ec82c70bd73e7a46c711795a862ed240e..cf5629f5206b5a9b9345610f8f0b44ccff017238 100644 (file)
--- 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 0e0e6142f29fcf12e74eda131025f087aa055214..be8e05e35abed74998990148a99f5ca819137d2f 100644 (file)
--- 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 e1fa5b26e66705ee234dc752480db4530ec90086..35ddf81214fdc9d409e8898cb76ea9ad0292383f 100644 (file)
--- 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 4b9f0befe95f39e31eba91bb61fef25ffd33f4c8..d88ee782a82630de4b41208e1016c11d80001e67 100644 (file)
--- 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 b7a3cc7965a32df764fe53f15ea09391a7cb2439..ac99bd6087cf6b3192a4f6f571e88641fd22b7af 100644 (file)
--- a/config/locales/ar.yml
+++ b/config/locales/ar.yml
@@ -1087,3 +1087,4 @@ ar:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 69de2b90f20ecf031662f7cc47a4e7805618dbec..5e4d8286490b33152b5d638bc54efa7618a7cb17 100644 (file)
--- a/config/locales/az.yml
+++ b/config/locales/az.yml
@@ -1184,3 +1184,4 @@ az:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 35cb43b84eb4a6d801d70b8b9a615d65c2fc9f3a..35d9032a3cdfdc79061958498a2510c1aa448ac5 100644 (file)
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -1084,3 +1084,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 ab811911d64bbcf832595d5c4e1ae4ce8ec8d64c..8f5d8f634e5c8f365b20f645a6f9518777bb10b8 100644 (file)
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -1100,3 +1100,4 @@ bs:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 93219adb01fb4c158730919899b090f36d60e7e7..de648a19701f92fd6f9c79791642c6a970ea6cc9 100644 (file)
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -1089,3 +1089,4 @@ ca:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 52c5faf54747f1512f337dd9ecf7b5b3e4bfb2a0..5c20f7c639b7695f74b89e84862976fda3a93a21 100644 (file)
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1091,3 +1091,4 @@ cs:
   field_closed_on: Uzavřeno
   field_generate_password: Generovat heslo
   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 606e289843bb5c0d2d68ecdf7e4674175ac601ca..17b7ffbf31c3566988d7c59af576baef15fdb8e3 100644 (file)
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -1104,3 +1104,4 @@ da:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 2ec12623b11c9f4e44568786f0f18ebde896ad0c..96f86ce950c583f49d2bf1ef15c2c015ead035a8 100644 (file)
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1099,4 +1099,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 2235a296666f98076fc59b0ab56d8139a432e23e..e4df4ffe52bf2581442d968589672ed16c45a03d 100644 (file)
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -1087,3 +1087,4 @@ el:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 a06e7fc4472eb5fedae501f2d3daf5ff613ba28b..9e392d69d773de5298f292d0912afbca903ac8bb 100644 (file)
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -1089,3 +1089,4 @@ en-GB:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 d2da3d2b107b83305af4659d3c17018a1055d4f1..bc997b4d7a935b8a9809456c09fe4bd389df4d90 100644 (file)
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -619,6 +619,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 d051eddd4bfbae978509a158ad8221a72c34082c..d8262b03f0adbbdec364c9745cb0ddaf8d80a166 100644 (file)
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1123,3 +1123,4 @@ es:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 b52ff1d1233f0c90c0ef4a21016081ef8af4e935..c7ea6add94473a212660f2284e3d023a36d5aaf8 100644 (file)
--- a/config/locales/et.yml
+++ b/config/locales/et.yml
@@ -1100,3 +1100,4 @@ et:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 cc96dba946b111313d89d65e8bd2d6de75c79138..6f94d0bc9efde9b692a88cdbce58be7867c4b6bb 100644 (file)
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -1088,3 +1088,4 @@ eu:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 a7b7050bb1ae2beea24a32aed8992e574ffcb1e8..3d2cc9a3766a86bdf9eaa2ab8385e52d97a16bd1 100644 (file)
--- a/config/locales/fa.yml
+++ b/config/locales/fa.yml
@@ -1089,3 +1089,4 @@ fa:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 4f393f8785d69a4af1095ff9f754d78f487192d6..8fb56934849f830c573db32b6869f43940f6865b 100644 (file)
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -1108,3 +1108,4 @@ fi:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 6aba859af985c822c6df0b882bc90ddc7d660420..492f26a9b3fb4bae1040022ca35b0d22fa846cda 100644 (file)
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -613,6 +613,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 6333fe385cc081d9d916f18418f1130533ee6b9b..6ef9b71c43b82ac19603b351b2052cefd69621d8 100644 (file)
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -1098,3 +1098,4 @@ gl:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 0c3a6764ae1bad0b64e6d35eb2e4e56aad047d5f..01b3b199362a2510f9ab0c35e40b7b7293a9dd5c 100644 (file)
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -1092,3 +1092,4 @@ he:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 c3a22fbbec17845d21072f631cea3556501ec318..4a3597330eb3dc54f3d39a0740f16a0f10146f31 100644 (file)
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -1088,3 +1088,4 @@ hr:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 abbe5c8b5eec5b0068bcd9ed475972781f72f99c..319dc66ba9eac4bf043b0178d3adb6163e704088 100644 (file)
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -1106,3 +1106,4 @@
   field_closed_on: Closed
   field_generate_password: Generate password
   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 7ceaf77bc19ce029caf0180ed30316cad6d9f3c4..2baded43e3863fcdb2e37ea41751504fb1430963 100644 (file)
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -1091,3 +1091,4 @@ id:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 124efd704beca494c525cad494590057262ea264..1363ea0b6efe2e33317d4096e9d17212522a2339 100644 (file)
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -1088,3 +1088,4 @@ it:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 7b3a2a07a53cd33ba8e2af920b30d981c82544d5..1dcb398fcccd63142c7b547b73797ed529d40233 100644 (file)
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1116,3 +1116,4 @@ ja:
   field_inherit_members: メンバーを継承
   field_closed_on: 終了日
   field_generate_password: パスワードを自動生成
+  label_total_time: 合計

diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index eefa19423a6898ab348941191a7b726439a43b69..93e88c610caa860f30957dcda7db450bb2f7f856 100644 (file)
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -1137,3 +1137,4 @@ ko:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 c462023ec263c76ebc94a52f4e309915c6226428..d830bea6316a364ac0fefa5cce9b435733f60e3d 100644 (file)
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -1146,3 +1146,4 @@ lt:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 c77eda9461a3ea71eef050b0cf5bd34fb0ad4fbb..91a2133160227bf3bf501bf0d8eb45d71063f2cb 100644 (file)
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -1081,3 +1081,4 @@ lv:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 88f73f0a115bad517f008ea8851c4c4b3a053a08..c02f13dfe80db86d0015c035f02b0f278f0884ff 100644 (file)
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -1087,3 +1087,4 @@ mk:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 e9e04afc2b6c09355197b7c8b6ebb37aeb9a09ce..6ec884e9a809a92656f2c7d99d62816c6edf2643 100644 (file)
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -1088,3 +1088,4 @@ mn:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 f3ce18160c45ef6a32ee8ca605ef8428789f5462..f8fadda374eebfc595e3dbb4043bb7a7cda522af 100644 (file)
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -1069,3 +1069,4 @@ nl:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 04e736965235ba03f095ff36320ba3bdc5c3e109..72db37dee7c0d37d27eb7e22632c3ef1246a73fa 100644 (file)
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -1077,3 +1077,4 @@
   field_closed_on: Closed
   field_generate_password: Generate password
   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 e8664d2d21a5dd4f94aed3eb67434b51f28d4b90..25ffcc88ae3067576cb53b48bff6340634fe1011 100644 (file)
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -1108,3 +1108,4 @@ pl:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 8f5518e116c334fbf246cabb674afe918db0fca7..801eddbb5593d2154b36f86aa7f158b537a45b90 100644 (file)
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -1107,3 +1107,4 @@ pt-BR:
   field_closed_on: Fechado
   field_generate_password: Gerar senha
   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 1498a24898e65750944d069a928afaa57fdd3968..e7c62fd1b10c4cb54cd318661057ac2ac4b5b32a 100644 (file)
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -1093,3 +1093,4 @@ pt:
   field_closed_on: Fechado
   field_generate_password: Generate password
   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 5a472abb63ac6e111c5739665585d5af6647087c..4e20b31211476bef5c8882a8c2a18a63fb977430 100644 (file)
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -1082,3 +1082,4 @@ ro:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 1c01dbd56c6b9208cbc76d04cec59e3e9b97f4d1..9ef5d7ad2b5284f1b3bbad596df1c1d243d323f8 100644 (file)
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1197,3 +1197,4 @@ ru:
   field_closed_on: Закрыта
   field_generate_password: Создание пароля
   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 9c3561b9d452c5e9dde9173b316a39be3de4e60e..d25707ca05b07e77a6408a5e944aebd771cb8fe0 100644 (file)
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -1084,3 +1084,4 @@ sk:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 bf91bf8f6b44ab8d812fd5da32fe5ad6bd5703c8..0b7957fab490629325ef2cff70c3aef7cbdffdc7 100644 (file)
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -1087,3 +1087,4 @@ sl:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 c2717798fd38722a35483ba1fb9c0206ad4e5fae..6f7e4cdbec85caa5d5ea8586a0c618194f50b0fc 100644 (file)
--- a/config/locales/sq.yml
+++ b/config/locales/sq.yml
@@ -1083,3 +1083,4 @@ sq:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 24483f52cf959f042a79711b5322ad323319492a..27d0160429965f77b3c6768aa8c9169bb803dfdc 100644 (file)
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -1089,3 +1089,4 @@ sr-YU:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 8614ab3096764ebba9bfbe340f20fc5103deffc6..4ffc3bc36a6351305e2f2de311ce780f45d7027f 100644 (file)
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -1088,3 +1088,4 @@ sr:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 bc5a2442046f6936c322a5d2aec88ab5c33e1fa5..19b056fc1470e48d37ef1b34c8abf71eebfd13f0 100644 (file)
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -1125,3 +1125,4 @@ sv:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 64333de9b9f13e5c3d4a7552b9dff9bf395545e4..09b87921ee8bbe53c8d650850dbd79af8a6ae33a 100644 (file)
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -1084,3 +1084,4 @@ th:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 2cac992ad127cfafb24ffa2114c37d5a6188e620..724a5b1ee7de37abd724078f65e343e36087d3f1 100644 (file)
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -1106,3 +1106,4 @@ tr:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 e79f3b796f33c7390fb41a5872615eff87a75663..0718b2c97a056503079c73969d62c0b2be09f4fa 100644 (file)
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -1082,3 +1082,4 @@ uk:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 22a06315bdd1568679d424239f48ebd6aa3cfadd..3e06f12061a5412fa8a80ca50278ca1ca80e18f4 100644 (file)
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -1140,3 +1140,4 @@ vi:
   field_closed_on: Đã đóng
   field_generate_password: Generate password
   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 bbebce3c5700fdc8585dfd0632cee2c3e7964834..0ce3dd55c83dba95df3fcf69771e6721ecebf315 100644 (file)
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -1167,3 +1167,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 2e899c0304b6e193b6f09263aa0d31171bf2717c..d6227ddf8da2aa10a17f247938c9c0d8a6088415 100644 (file)
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1091,3 +1091,4 @@ zh:
   field_closed_on: Closed
   field_generate_password: Generate password
   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 76013614e46d4aeca168eb2bb9f3f68403a1e3d5..755cdc345e6b244e3633e4ad042752a0085f38d5 100644 (file)
--- 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')