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

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 3391cd1c55d451f80b9035d13adcffcbf987b924..52e49492b02d972e2199f90bf6e33b22deb1b781 100644 (file)
--- 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 194f3e8e7fe5e20ca2e33ac2e55dd155304afc7d..901df197640f7efd0ac07f2d601ba76b23fa0d77 100644 (file)
--- 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 42210ed7dbb1c7e2f7308345e18b766eadba2bce..f70f45a8ce57dfd408897e9effe200d9a3995997 100644 (file)
--- 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 0304c3432a0064b7d7f38307a8f7e227dba9527b..cec979ee43528042abec52687b3597c391589eb1 100644 (file)
--- 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 7770fbd4826e3a4017a38980425266b1a8a546cd..e01b7dcbf65c48f99c20c602e24d8f7091770d01 100644 (file)
--- 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 69b9871dfbea156f21c7600b8d6b7a9a88e57900..9ef7485226996bfe34f4982c5b8ff55f452b1e1f 100644 (file)
--- 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 c3c18a6c05ee5f31e4f1147b6d1ace840d191d8f..1cdc4d4cde5572985f912eb58689669056b3e463 100644 (file)
--- 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 8b1b894499735f6b4ab5e5ee39575a3e5299b8ed..d21dc9b8a32ddbb5e49efb836655947dd0df4307 100644 (file)
--- 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 638e13353e726a21cec52d40d0ba4377241cd17a..f122dd0586e9a1bf5715ce9b6046189d1e4900a0 100644 (file)
--- 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 f9f570fb7e7290620c317a84dc3b9eac62b6c201..d1dafe679d86721b820b94b5250aa2509a876c4f 100644 (file)
--- 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 2470cff52328d7169fdfa6b57d2c9d23afdd303c..ba16af6ed8da10e1e580780f26d98eda58f40675 100644 (file)
--- 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 4f8d54ecef2fbb94374541db8d33a6825a37cce2..2ec4fef2a5de35a710da4ef7e3acfa7e6c117a82 100644 (file)
--- 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 c09a776ec4c38b83e622d3b417829d68161452f6..0764b47c4293632c1aa4a885e7b4c741ad570259 100644 (file)
--- 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 edb560c171e7b20e94cdae988eb1d5bb8428d97c..5518d4be5ee8b98a701493ecdeb05124e5229929 100644 (file)
--- 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 c5afa906612d82e4e33afc1afa6a3e70ad1a9e18..a70578876568b5753d2bf28b223e4426546925af 100644 (file)
--- 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 7997a2bfdc6dd57cc741b56cce8060e3976f605d..e05aa6ef2a779667cb60ea51f31eb499870f89fe 100644 (file)
--- 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 439e3b1df81a80625c5c142bb96fa575b590d4ce..dcd8cf154097687bfac97c5cf7f3ef5a408aa8b5 100644 (file)
--- 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 d36e3367f3733998a97e8017c7ecaf79f5386383..bf0d742a4e8251b0bef9e369ba70a13c5e112850 100644 (file)
--- 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 59d1fe292e4622bc6de692eba640193c6da82742..83e1ec9533159ecc96d0c750f69b249b57b003c0 100644 (file)
--- 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 5803569b94c08f26434841351ebe7b86c005d416..007c9fa093a575294b873e465d0b5271685e15f4 100644 (file)
--- 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 1a7850e485d7282360be98503c23a7ae045f83b9..2544bd77df54d0bbe619395f37f621d16c96fedf 100644 (file)
--- 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 9312af84f70fceda036a3059c864b8432217868a..248e687bc31b6865b2a2d5299fc53c09b23618a4 100644 (file)
--- 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 1769db613b9ddb5f669baf88c0ecdc4dcb330e3c..5ea2631ab13719a9ffe25a7f5ff56393c14adc26 100644 (file)
--- 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 f0caa5738f972b33b8c8d774d6865cc3053a23b1..bbf975459ec56ce35441c49efefe32541015cb2a 100644 (file)
--- 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 b0290dcfaa53ac514ecea012f16c70dd99fd6bba..5f688820bf6ad1872075c968e2f9456cfcbbe8db 100644 (file)
--- 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 89e3d07fb0fe908f00553730b4723e0cdcc702c5..1159854f719d2d5bd35c9e7bae384f825665fea5 100644 (file)
--- 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 ec9ee666d927d9f8e73e67f3805b0396064a2292..4dddbf0b4faf565f8295fd2770a3bed44092bae8 100644 (file)
--- 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 066b484f4b44fa8e47425a7ea0c5f7dad1445568..f8afade89a530595e1851e29d40ac331c9e7baae 100644 (file)
--- 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 67fea4ca23259035dff6b3a16bffea69538a1068..d3eb70ec92b03f8cf642371b5635ae4e37f025d3 100644 (file)
--- 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 f22304e88fba26bcc9647934822fad253d60de34..cbaea2e20ac31c36a887a379fd27b68c8e31375d 100644 (file)
--- 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 2e880f229c37dbd0df823876a05cc590deb33d64..e2249c594edbfc8edb7c326dd68fb5d1b79132da 100644 (file)
--- 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 3cb895a592e43bbc8257985815abfdc49dfaa18b..ff6eff31a1954b8bfef0492a9c95260ba8c46c6a 100644 (file)
--- 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 9d2793ea0f159cb1aa405ddeb5bbb4b633fd7c3c..c305083ba24e7a5ac71806d6e25a189f271a9234 100644 (file)
--- 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 1c60e5f876ba3037be9d96488d7776936920d115..5deff0a688aacb9bc1802be27517653e9f6ca71f 100644 (file)
--- 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 fcadde6fb258f3305c36615cd48b3b96562fee00..ef7f0854f4ed4d1f013a9d4b3039dfd325234651 100644 (file)
--- 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 a6f6c2fdffeff6e41d7bfab23cb3759f621ac61b..4e08f65496bd9c94af4201c083f11049a53ab57b 100644 (file)
--- 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 5fcd5c8f4510471990ab217d709225f84a92d94a..b9b4d6a0cfabe3d2581d6add3822764e050229e6 100644 (file)
--- 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 e531ca8e21be6231695bf67ea1d9809ac57f6bdc..8c6e22b404c3d102f617a7ce3e71137253ce2045 100644 (file)
--- 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 411c6b563e116a0beaed1bd240c830ceee206bed..3336181c5746c45a2707839902a8b365635c4dc8 100644 (file)
--- 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 781909f25f74f2eff0995a3691c69c5e19273d8f..86590627afa5bed38adf075b8d534aa4355423d7 100644 (file)
--- 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 cf3447f6315548b2a80e455c09dcededb767ff80..c06be94d4f0fac15d0d3c35b7ab5e7cbaace45bf 100644 (file)
--- 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 54f2cbf7f2cbb35a8d17397020f7573d560b9fb4..b44b566b08cd4ca56147ff4296fbabf474e13a45 100644 (file)
--- 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 90d6e15ad20a41a060dcb89243a8fa54fcc3216a..326a261a65c5b56dd6e663623749171c42c53049 100644 (file)
--- 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 7ac7b3ed55d3ecd4a002a703be43fee49f110f5c..383b0b889b5a7056994717d98c9e53c48a6207fc 100644 (file)
--- 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 bb2b7e49115fec1f7d0c16263cf9303147623f10..821ec254b997716cab32438b69fc9525f6a22410 100644 (file)
--- 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 e71350126a8adc8a31adcffbc7d6006dbc068419..8703db8e6a7056a5064b90bcb21a26f9d1da7faf 100644 (file)
--- 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 da6a45c90ac5c39cd50c370a133e3b6a6a751c37..ee00add321e03d6b612ee4362634e6d7de4ccac6 100644 (file)
--- 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 543596fc04c5eb0993d1a7a280ea55bf7c73cc20..cb358c25a61eeb4f6a5cd03212a5f3b51b43370e 100644 (file)
--- 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 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')