From e2877d9287f6df945a3da34ba83555b25ddc29fe Mon Sep 17 00:00:00 2001 From: Eric Davis Date: Sun, 31 Oct 2010 23:57:50 +0000 Subject: [PATCH] Merged r4312 from trunk. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4346 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- app/views/groups/_users.html.erb | 2 +- app/views/projects/settings/_members.rhtml | 2 +- config/locales/bg.yml | 2 ++ config/locales/bs.yml | 2 ++ config/locales/ca.yml | 2 ++ config/locales/cs.yml | 2 ++ config/locales/da.yml | 2 ++ config/locales/de.yml | 2 ++ config/locales/el.yml | 2 ++ config/locales/en-GB.yml | 4 +++- config/locales/en.yml | 2 ++ config/locales/es.yml | 2 ++ config/locales/eu.yml | 2 ++ config/locales/fi.yml | 2 ++ config/locales/fr.yml | 2 ++ config/locales/gl.yml | 2 ++ config/locales/he.yml | 2 ++ config/locales/hr.yml | 2 ++ config/locales/hu.yml | 2 ++ config/locales/id.yml | 2 ++ config/locales/it.yml | 2 ++ config/locales/ja.yml | 2 ++ config/locales/ko.yml | 2 ++ config/locales/lt.yml | 2 ++ config/locales/lv.yml | 2 ++ config/locales/mk.yml | 2 ++ config/locales/mn.yml | 2 ++ config/locales/nl.yml | 2 ++ config/locales/no.yml | 2 ++ config/locales/pl.yml | 2 ++ config/locales/pt-BR.yml | 2 ++ config/locales/pt.yml | 2 ++ config/locales/ro.yml | 2 ++ config/locales/ru.yml | 2 ++ config/locales/sk.yml | 2 ++ config/locales/sl.yml | 2 ++ config/locales/sr-YU.yml | 2 ++ config/locales/sr.yml | 2 ++ config/locales/sv.yml | 2 ++ config/locales/th.yml | 2 ++ config/locales/tr.yml | 2 ++ config/locales/uk.yml | 2 ++ config/locales/vi.yml | 2 ++ config/locales/zh-TW.yml | 2 ++ config/locales/zh.yml | 2 ++ 45 files changed, 89 insertions(+), 3 deletions(-) diff --git a/app/views/groups/_users.html.erb b/app/views/groups/_users.html.erb index d3a789936..580851d5a 100644 --- a/app/views/groups/_users.html.erb +++ b/app/views/groups/_users.html.erb @@ -29,7 +29,7 @@ <% remote_form_for(:group, @group, :url => {:controller => 'groups', :action => 'add_users', :id => @group}, :method => :post) do |f| %>
<%=l(:label_user_new)%> -

<%= text_field_tag 'user_search', nil %>

+

<%= label_tag "user_search", l(:label_user_search) %><%= text_field_tag 'user_search', nil %>

<%= observe_field(:user_search, :frequency => 0.5, :update => :users, diff --git a/app/views/projects/settings/_members.rhtml b/app/views/projects/settings/_members.rhtml index 88345b43d..d1c167566 100644 --- a/app/views/projects/settings/_members.rhtml +++ b/app/views/projects/settings/_members.rhtml @@ -58,7 +58,7 @@ <% remote_form_for(:member, @member, :url => {:controller => 'members', :action => 'new', :id => @project}, :method => :post) do |f| %>
<%=l(:label_member_new)%> -

<%= text_field_tag 'principal_search', nil %>

+

<%= label_tag "principal_search", l(:label_principal_search) %><%= text_field_tag 'principal_search', nil %>

<%= observe_field(:principal_search, :frequency => 0.5, :update => :principals, diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 2dc2eedae..816873b76 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -919,3 +919,5 @@ bg: button_edit_associated_wikipage: "Edit associated Wiki page: {{page_title}}" field_assigned_to_role: Assignee's role field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/bs.yml b/config/locales/bs.yml index cebfe46f5..a836fde41 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -933,3 +933,5 @@ bs: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ca.yml b/config/locales/ca.yml index effc8bd69..c131820d6 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -921,3 +921,5 @@ ca: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/cs.yml b/config/locales/cs.yml index 8996c09c6..362e2dee4 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -918,3 +918,5 @@ cs: text_are_you_sure_with_children: Smazat úkol včetně všech podúkolů? field_text: Textové pole field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/da.yml b/config/locales/da.yml index 03bbe6f46..0bbfa0b71 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -935,3 +935,5 @@ da: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/de.yml b/config/locales/de.yml index 470d2b3ae..a3b79f57d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -791,6 +791,8 @@ de: label_profile: Profil label_subtask_plural: Unteraufgaben label_project_copy_notifications: Sende Mailbenachrichtigungen beim Kopieren des Projekts. + label_principal_search: "Nach Benutzer oder Gruppe suchen:" + label_user_search: "Nach Benutzer suchen:" button_login: Anmelden button_submit: OK diff --git a/config/locales/el.yml b/config/locales/el.yml index 242cdb40e..2c141af73 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -919,3 +919,5 @@ el: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/en-GB.yml b/config/locales/en-GB.yml index 19c4a6eae..4dff6fa09 100644 --- a/config/locales/en-GB.yml +++ b/config/locales/en-GB.yml @@ -922,4 +922,6 @@ en-GB: 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 - + notice_not_authorized_archived_project: The project you're trying to access has been archived. + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/en.yml b/config/locales/en.yml index 0ff7eeb97..6a1c98933 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -776,6 +776,8 @@ en: label_profile: Profile label_subtask_plural: Subtasks label_project_copy_notifications: Send email notifications during the project copy + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" button_login: Login button_submit: Submit diff --git a/config/locales/es.yml b/config/locales/es.yml index e364c143c..51a7e7b9a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -959,3 +959,5 @@ es: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/eu.yml b/config/locales/eu.yml index 16b1445c8..6c7b3236e 100644 --- a/config/locales/eu.yml +++ b/config/locales/eu.yml @@ -922,3 +922,5 @@ eu: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/fi.yml b/config/locales/fi.yml index f51c16d9d..8b7196175 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -943,3 +943,5 @@ fi: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/fr.yml b/config/locales/fr.yml index ddc7606a3..4d5f8b3b2 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -774,6 +774,8 @@ fr: label_profile: Profil label_subtask_plural: Sous-tâches label_project_copy_notifications: Envoyer les notifications durant la copie du projet + label_principal_search: "Rechercher un utilisateur ou un groupe :" + label_user_search: "Rechercher un utilisateur :" button_login: Connexion button_submit: Soumettre diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 243070351..6fea5d5c1 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -935,3 +935,5 @@ gl: field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/he.yml b/config/locales/he.yml index e96c31ed7..50107c320 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -931,3 +931,5 @@ he: field_member_of_group: Assignee's group field_assigned_to_role: Assignee's role field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/hr.yml b/config/locales/hr.yml index 3937f25b0..414ff5613 100644 --- a/config/locales/hr.yml +++ b/config/locales/hr.yml @@ -925,3 +925,5 @@ hr: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/hu.yml b/config/locales/hu.yml index b8c072b66..4c59ecd5e 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -941,3 +941,5 @@ text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/id.yml b/config/locales/id.yml index 5e1a567c1..93fc17b78 100644 --- a/config/locales/id.yml +++ b/config/locales/id.yml @@ -926,3 +926,5 @@ id: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/it.yml b/config/locales/it.yml index 32c26c9f6..787e1427d 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -922,3 +922,5 @@ it: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ja.yml b/config/locales/ja.yml index c68b51ca9..d2a70f7f0 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -948,3 +948,5 @@ ja: enumeration_activities: 作業分類 (時間トラッキング) enumeration_system_activity: システム作業分類 field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 15d9f8b8b..dabe06e48 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -974,3 +974,5 @@ ko: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/lt.yml b/config/locales/lt.yml index f977980f6..f3eaa0cea 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -982,3 +982,5 @@ lt: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/lv.yml b/config/locales/lv.yml index 280af883a..b241c556e 100644 --- a/config/locales/lv.yml +++ b/config/locales/lv.yml @@ -913,3 +913,5 @@ lv: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/mk.yml b/config/locales/mk.yml index 0443c60ad..a209f991f 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -918,3 +918,5 @@ mk: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/mn.yml b/config/locales/mn.yml index 6e9c191e0..604b62027 100644 --- a/config/locales/mn.yml +++ b/config/locales/mn.yml @@ -919,3 +919,5 @@ mn: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 6be9743c1..780d9365b 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -900,3 +900,5 @@ nl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/no.yml b/config/locales/no.yml index 2eed6ba7f..bef22e0fb 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -909,3 +909,5 @@ text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 434f0afe1..1d1587f74 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -939,3 +939,5 @@ pl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index 8234d0456..dfff5ab3d 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -946,3 +946,5 @@ pt-BR: label_user_mail_option_only_my_events: Somente para as coisas que eu esteja observando ou esteja envolvido label_user_mail_option_only_assigned: Somente para as coisas que estejam atribuídas a mim field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 3eb5a0069..d767b5af4 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -926,3 +926,5 @@ pt: text_are_you_sure_with_children: Apagar tarefa e todas as sub-tarefas? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 70ae2feb5..fad5b3c03 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -911,3 +911,5 @@ ro: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/ru.yml b/config/locales/ru.yml index c9477ff60..cba9d07c9 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -1040,3 +1040,5 @@ ru: field_assigned_to_role: Роль назначенного notice_not_authorized_archived_project: Запрашиваемый проект был архивирован. + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sk.yml b/config/locales/sk.yml index 90c9c3a18..089cba11c 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -913,3 +913,5 @@ sk: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sl.yml b/config/locales/sl.yml index 895e01291..a538065d7 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -914,3 +914,5 @@ sl: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sr-YU.yml b/config/locales/sr-YU.yml index a17c67a3a..f235c9690 100644 --- a/config/locales/sr-YU.yml +++ b/config/locales/sr-YU.yml @@ -918,3 +918,5 @@ sr-YU: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sr.yml b/config/locales/sr.yml index ed4be207b..f9777490c 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -919,3 +919,5 @@ sr: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/sv.yml b/config/locales/sv.yml index 0bd528608..1e96f9f9b 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -970,3 +970,5 @@ sv: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/th.yml b/config/locales/th.yml index a09d9973a..6e90780f9 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -915,3 +915,5 @@ th: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 9d204178b..ce0d21586 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -941,3 +941,5 @@ tr: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/uk.yml b/config/locales/uk.yml index 61e1e7371..a48af1d03 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -914,3 +914,5 @@ uk: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 5b734df8d..06d83eb54 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -973,3 +973,5 @@ vi: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index e5c860494..7e38d0bb0 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -1009,3 +1009,5 @@ enumeration_activities: 活動 (時間追蹤) enumeration_system_activity: 系統活動 + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:" diff --git a/config/locales/zh.yml b/config/locales/zh.yml index 476a50f36..817a7bd21 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -936,3 +936,5 @@ zh: text_are_you_sure_with_children: Delete issue and all child issues? field_text: Text field field_start_date: Start date + label_principal_search: "Search for user or group:" + label_user_search: "Search for user:"