Merged r4169 from trunk.

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

43 files changed, 48 insertions, 23 deletions

diff --git a/config/locales/bg.yml b/config/locales/bg.yml
index ea6966484..a9b480e71 100644
--- a/config/locales/bg.yml
+++ b/config/locales/bg.yml
@@ -911,4 +911,5 @@ bg:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/bs.yml b/config/locales/bs.yml
index 74a31a4fe..25eb94b82 100644
--- a/config/locales/bs.yml
+++ b/config/locales/bs.yml
@@ -931,4 +931,5 @@ bs:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/ca.yml b/config/locales/ca.yml
index 4c9010d98..a418038e9 100644
--- a/config/locales/ca.yml
+++ b/config/locales/ca.yml
@@ -919,4 +919,5 @@ ca:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 4cfc05ce5..634173650 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -917,4 +917,5 @@ cs:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/da.yml b/config/locales/da.yml
index bd3a13c3d..f7d27a369 100644
--- a/config/locales/da.yml
+++ b/config/locales/da.yml
@@ -933,4 +933,5 @@ da:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/de.yml b/config/locales/de.yml
index d512a64f3..806fa81fe 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -935,4 +935,5 @@ de:
   field_member_of_group: Member of Group
   field_assigned_to_role: Member of Role
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/el.yml b/config/locales/el.yml
index fa538886f..396f925fb 100644
--- a/config/locales/el.yml
+++ b/config/locales/el.yml
@@ -917,4 +917,5 @@ el:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml
index 219c5104f..808673e30 100644
--- a/config/locales/en-GB.yml
+++ b/config/locales/en-GB.yml
@@ -921,4 +921,5 @@ en-GB:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d91d8103a..c1befee4e 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -293,6 +293,9 @@ en:
   field_group_by: Group results by
   field_sharing: Sharing
   field_parent_issue: Parent task
+  field_member_of_group: Member of Group
+  field_assigned_to_role: Member of Role
+  field_text: Text field
   
   setting_app_title: Application title
   setting_app_subtitle: Application subtitle
diff --git a/config/locales/es.yml b/config/locales/es.yml
index bad6cc42f..e837c868d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -957,4 +957,5 @@ es:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/eu.yml b/config/locales/eu.yml
index 983fe1482..69c405ce2 100644
--- a/config/locales/eu.yml
+++ b/config/locales/eu.yml
@@ -921,3 +921,4 @@ eu:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/fi.yml b/config/locales/fi.yml
index ea14a5c0d..376ebdf03 100644
--- a/config/locales/fi.yml
+++ b/config/locales/fi.yml
@@ -942,3 +942,4 @@ fi:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 9a62181ec..087c83391 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -935,4 +935,5 @@ fr:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Modifier la page de Wiki associée: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/gl.yml b/config/locales/gl.yml
index 81ad5ff9f..7d5f29257 100644
--- a/config/locales/gl.yml
+++ b/config/locales/gl.yml
@@ -933,4 +933,5 @@ gl:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
 
diff --git a/config/locales/he.yml b/config/locales/he.yml
index ed3dfa081..a51da345e 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -922,4 +922,4 @@ he:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/hr.yml b/config/locales/hr.yml
index 9219ac660..c31a4bf36 100644
--- a/config/locales/hr.yml
+++ b/config/locales/hr.yml
@@ -924,3 +924,4 @@ hr:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e099cb9bc..ef712b625 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -940,3 +940,4 @@
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/id.yml b/config/locales/id.yml
index 185d4f21d..1c6e1c2d2 100644
--- a/config/locales/id.yml
+++ b/config/locales/id.yml
@@ -925,3 +925,4 @@ id:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/it.yml b/config/locales/it.yml
index be0da6a48..cdf12cd9e 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -921,3 +921,4 @@ it:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 7a9ded16a..a305ce77f 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -810,6 +810,7 @@ ja:
   button_create_and_continue: 連続作成
   button_test: テスト
   button_edit: 編集
+  button_edit_associated_wikipage: "関連するWikiページを編集: {{page_title}}"
   button_add: 追加
   button_change: 変更
   button_apply: 適用
@@ -861,6 +862,7 @@ ja:
   text_subprojects_destroy_warning: "サブプロジェクト {{value}} も削除されます。"
   text_workflow_edit: ワークフローを編集するロールとトラッカーを選んでください
   text_are_you_sure: よろしいですか？
+  text_are_you_sure_with_children: チケットとその子チケット全てを削除しますか?
   text_journal_changed: "{{label}} を {{old}} から {{new}} に変更"
   text_journal_set_to: "{{label}} を {{value}} にセット"
   text_journal_deleted: "{{label}} を削除 ({{old}})"
@@ -938,5 +940,4 @@ ja:
   enumeration_doc_categories: 文書カテゴリ
   enumeration_activities: 作業分類 (時間トラッキング)
   enumeration_system_activity: システム作業分類
-  button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
-  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index 511c8b55e..4534893a9 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -973,4 +973,4 @@ ko:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/lt.yml b/config/locales/lt.yml
index ace5c8d05..fcaf1e161 100644
--- a/config/locales/lt.yml
+++ b/config/locales/lt.yml
@@ -981,4 +981,4 @@ lt:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/lv.yml b/config/locales/lv.yml
index fc1c4b6ce..15e3a5e5a 100644
--- a/config/locales/lv.yml
+++ b/config/locales/lv.yml
@@ -912,4 +912,4 @@ lv:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/mk.yml b/config/locales/mk.yml
index fb2f78d29..ae02f4012 100644
--- a/config/locales/mk.yml
+++ b/config/locales/mk.yml
@@ -917,3 +917,4 @@ mk:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/mn.yml b/config/locales/mn.yml
index 8676b2235..cf5f2b63d 100644
--- a/config/locales/mn.yml
+++ b/config/locales/mn.yml
@@ -918,4 +918,4 @@ mn:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index 615dbe4fb..c38e37d92 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -899,4 +899,4 @@ nl:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 4b76683fc..6fc5abeac 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -908,3 +908,4 @@
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b977fbd5c..fe2bde0d7 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -938,4 +938,4 @@ pl:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 64e99d897..6f5135403 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -941,4 +941,4 @@ pt-BR:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 29b4e4d61..4646e28ce 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -925,4 +925,4 @@ pt:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/ro.yml b/config/locales/ro.yml
index 6796e3048..f9285e5f3 100644
--- a/config/locales/ro.yml
+++ b/config/locales/ro.yml
@@ -910,4 +910,4 @@ ro:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 6f01a7dc6..8be88534a 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -369,6 +369,7 @@ ru:
   field_subject: Тема
   field_subproject: Подпроект
   field_summary: Сводка
+  field_text: Текстовое поле
   field_time_entries: Затраченное время
   field_time_zone: Часовой пояс
   field_title: Название
diff --git a/config/locales/sk.yml b/config/locales/sk.yml
index 57ef8e3cd..d1c9109d7 100644
--- a/config/locales/sk.yml
+++ b/config/locales/sk.yml
@@ -912,4 +912,4 @@ sk:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 282804cb9..48616ec40 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -913,4 +913,4 @@ sl:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml
index 8e034580c..f7b2d5429 100644
--- a/config/locales/sr-YU.yml
+++ b/config/locales/sr-YU.yml
@@ -917,4 +917,4 @@ sr-YU:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/sr.yml b/config/locales/sr.yml
index 2f7b7bb7b..c98e5c124 100644
--- a/config/locales/sr.yml
+++ b/config/locales/sr.yml
@@ -918,4 +918,4 @@ sr:
 
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 13c3c6712..1bc1c78b0 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -962,4 +962,4 @@ sv:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/th.yml b/config/locales/th.yml
index 466f33462..9c8029cad 100644
--- a/config/locales/th.yml
+++ b/config/locales/th.yml
@@ -914,4 +914,4 @@ th:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index 94e2fd83b..e9904fdfe 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -940,4 +940,4 @@ tr:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/uk.yml b/config/locales/uk.yml
index 2c15108fd..ae5acabc1 100644
--- a/config/locales/uk.yml
+++ b/config/locales/uk.yml
@@ -913,4 +913,4 @@ uk:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/vi.yml b/config/locales/vi.yml
index 0e709be20..a02417363 100644
--- a/config/locales/vi.yml
+++ b/config/locales/vi.yml
@@ -972,4 +972,4 @@ vi:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
-
+  field_text: Text field
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 37d830d3d..039bdfc7e 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -924,6 +924,7 @@
   text_subprojects_destroy_warning: "下列子專案： {{value}} 將一併被刪除。"
   text_workflow_edit: 選擇角色與追蹤標籤以設定其工作流程
   text_are_you_sure: 確定執行？
+  text_are_you_sure_with_children: "確定刪除此工作項目及其子項目？"
   text_journal_changed: "{{label}} 從 {{old}} 變更為 {{new}}"
   text_journal_set_to: "{{label}} 設定為 {{value}}"
   text_journal_deleted: "{{label}} 已刪除 ({{old}})"
@@ -1001,5 +1002,4 @@
   enumeration_doc_categories: 文件分類
   enumeration_activities: 活動 (時間追蹤)
   enumeration_system_activity: 系統活動
-
-  text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 35d5bb818..76bd9d988 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -935,3 +935,4 @@ zh:
   field_assigned_to_role: Member of Role
   button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}"
   text_are_you_sure_with_children: Delete issue and all child issues?
+  field_text: Text field