From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Sun, 18 Jul 2010 15:53:46 +0000 (+0000)
Subject: Merged r3847 from trunk.
X-Git-Tag: 1.0.0~6
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a2a3dae974fff867c32bd61dd919045bcd8afe64;p=redmine.git

Merged r3847 from trunk.

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

diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index e3cf7d1c0..9365505d0 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -930,5 +930,5 @@ pt-BR:
   notice_failed_to_save_members: "Falha ao gravar membro(s): {{errors}}."
   text_zoom_out: Afastar zoom
   text_zoom_in: Aproximar zoom
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  notice_unable_delete_time_entry: Não foi possível excluir a entrada no registro de horas trabalhadas.
+  label_overall_spent_time: Tempo gasto geral
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 5386c1fca..cce123622 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1022,5 +1022,5 @@ ru:
   field_principal: Глава
   text_zoom_out: Отдалить
   text_zoom_in: Приблизить
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
+  notice_unable_delete_time_entry: Невозможно удалить запись журнала.
+  label_overall_spent_time: Всего затрачено времени
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 30ac17004..23450007a 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -203,6 +203,7 @@ sv:
   notice_account_pending: "Ditt konto skapades och avvaktar nu administratörens godkännande."
   notice_default_data_loaded: Standardkonfiguration inläst.
   notice_unable_delete_version: Denna version var inte möjlig att ta bort.
+  notice_unable_delete_time_entry: Tidloggning kunde inte tas bort.
   notice_issue_done_ratios_updated: % klart uppdaterade.
   
   error_can_t_load_default_data: "Standardkonfiguration gick inte att läsa in: {{value}}"
@@ -689,6 +690,7 @@ sv:
   label_changes_details: Detaljer om alla ändringar
   label_issue_tracking: Ärendeuppföljning
   label_spent_time: Spenderad tid
+  label_overall_spent_time: Total tid spenderad
   label_f_hour: "{{value}} timme"
   label_f_hour_plural: "{{value}} timmar"
   label_time_tracking: Tidsuppföljning
@@ -951,5 +953,3 @@ sv:
   enumeration_doc_categories: Dokumentkategorier
   enumeration_activities: Aktiviteter (tidsuppföljning)
   enumeration_system_activity: Systemaktivitet
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 7d5c8091c..fc5f557d1 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -243,6 +243,7 @@
   notice_account_pending: "您的帳號已經建立，正在等待管理員的審核。"
   notice_default_data_loaded: 預設組態已載入成功。
   notice_unable_delete_version: 無法刪除版本。
+  notice_unable_delete_time_entry: 無法刪除工時記錄項目。
   notice_issue_done_ratios_updated: 項目完成百分比已更新。
 
   error_can_t_load_default_data: "無法載入預設組態： {{value}}"
@@ -729,6 +730,7 @@
   label_changes_details: 所有變更的明細
   label_issue_tracking: 項目追蹤
   label_spent_time: 耗用工時
+  label_overall_spent_time: 整體耗用工時
   label_f_hour: "{{value}} 小時"
   label_f_hour_plural: "{{value}} 小時"
   label_time_tracking: 工時追蹤
@@ -991,5 +993,3 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
-  notice_unable_delete_time_entry: Unable to delete time log entry.
-  label_overall_spent_time: Overall spent time
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 49725b0a6..6fdb33f52 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -428,7 +428,7 @@ zh:
     one:   1 个项目
     other: "{{count}} 个项目"
   label_project_all: 所有的项目
-  label_project_latest: 最近更新的项目
+  label_project_latest: 最近的项目
   label_issue: 问题
   label_issue_new: 新建问题
   label_issue_plural: 问题
@@ -592,10 +592,10 @@ zh:
   label_all_time: 全部时间
   label_yesterday: 昨天
   label_this_week: 本周
-  label_last_week: 下周
+  label_last_week: 上周
   label_last_n_days: "最后 {{count}} 天"
   label_this_month: 本月
-  label_last_month: 下月
+  label_last_month: 上月
   label_this_year: 今年
   label_date_range: 日期范围
   label_less_than_ago: 之前天数少于