diff --git a/app/views/issues/_action_menu.rhtml b/app/views/issues/_action_menu.rhtml index 390488e..693b492 100644 --- a/app/views/issues/_action_menu.rhtml +++ b/app/views/issues/_action_menu.rhtml @@ -3,7 +3,8 @@ <%= link_to_if_authorized l(:button_log_time), {:controller => 'timelog', :action => 'edit', :issue_id => @issue}, :class => 'icon icon-time-add' %> <% replace_watcher ||= 'watcher' %> <%= watcher_tag(@issue, User.current, {:id => replace_watcher, :replace => ['watcher','watcher2']}) %> -<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-copy' %> +<%= link_to_if_authorized l(:button_duplicate), {:controller => 'issues', :action => 'new', :project_id => @project, :copy_from => @issue }, :class => 'icon icon-duplicate' %> +<%= link_to_if_authorized l(:button_copy), {:controller => 'issues', :action => 'move', :id => @issue, :copy_options => {:copy => 't'} }, :class => 'icon icon-copy' %> <%= link_to_if_authorized l(:button_move), {:controller => 'issues', :action => 'move', :id => @issue }, :class => 'icon icon-move' %> <%= link_to_if_authorized l(:button_delete), {:controller => 'issues', :action => 'destroy', :id => @issue}, :confirm => l(:text_are_you_sure), :method => :post, :class => 'icon icon-del' %> diff --git a/app/views/issues/context_menu.rhtml b/app/views/issues/context_menu.rhtml index e408e3b..6cb0560 100644 --- a/app/views/issues/context_menu.rhtml +++ b/app/views/issues/context_menu.rhtml @@ -98,13 +98,11 @@ <% end %> <% if @issue.present? %> -
-<%= check_box_tag "copy_options[copy]", "1", @copy %>
-<%= submit_tag l(:button_move) %> -<%= submit_tag l(:button_move_and_follow), :name => 'follow' %> +<% if @copy %> + <%= hidden_field_tag("copy_options[copy]", "1") %> + <%= submit_tag l(:button_copy) %> + <%= submit_tag l(:button_copy_and_follow), :name => 'follow' %> +<% else %> + <%= submit_tag l(:button_move) %> + <%= submit_tag l(:button_move_and_follow), :name => 'follow' %> +<% end %> <% end %> diff --git a/config/locales/bg.yml b/config/locales/bg.yml index 04d266e..2e9b247 100644 --- a/config/locales/bg.yml +++ b/config/locales/bg.yml @@ -842,3 +842,5 @@ bg: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/bs.yml b/config/locales/bs.yml index 5728911..70d95cf 100644 --- a/config/locales/bs.yml +++ b/config/locales/bs.yml @@ -866,3 +866,5 @@ bs: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/ca.yml b/config/locales/ca.yml index 37e8a74..11daf4f 100644 --- a/config/locales/ca.yml +++ b/config/locales/ca.yml @@ -845,3 +845,5 @@ ca: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/cs.yml b/config/locales/cs.yml index a237b22..c6b7837 100644 --- a/config/locales/cs.yml +++ b/config/locales/cs.yml @@ -848,3 +848,5 @@ cs: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/da.yml b/config/locales/da.yml index 1353b06..18954df 100644 --- a/config/locales/da.yml +++ b/config/locales/da.yml @@ -868,3 +868,5 @@ da: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/de.yml b/config/locales/de.yml index ce92fea..38df64d 100644 --- a/config/locales/de.yml +++ b/config/locales/de.yml @@ -868,3 +868,5 @@ de: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/el.yml b/config/locales/el.yml index 475bf6d..74faa73 100644 --- a/config/locales/el.yml +++ b/config/locales/el.yml @@ -848,3 +848,5 @@ el: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/en.yml b/config/locales/en.yml index f3750a9..184788e 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -753,10 +753,12 @@ en: button_rename: Rename button_change_password: Change password button_copy: Copy + button_copy_and_follow: Copy and follow button_annotate: Annotate button_update: Update button_configure: Configure button_quote: Quote + button_duplicate: Duplicate status_active: active status_registered: registered diff --git a/config/locales/es.yml b/config/locales/es.yml index 409eb13..14e0494 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -889,3 +889,5 @@ es: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/fi.yml b/config/locales/fi.yml index 3049664..bc5ea3e 100644 --- a/config/locales/fi.yml +++ b/config/locales/fi.yml @@ -878,3 +878,5 @@ fi: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/fr.yml b/config/locales/fr.yml index d1ea260..b39907c 100644 --- a/config/locales/fr.yml +++ b/config/locales/fr.yml @@ -769,10 +769,12 @@ fr: button_rename: Renommer button_change_password: Changer de mot de passe button_copy: Copier + button_copy_and_follow: Copier et suivre button_annotate: Annoter button_update: Mettre à jour button_configure: Configurer button_quote: Citer + button_duplicate: Dupliquer status_active: actif status_registered: enregistré diff --git a/config/locales/gl.yml b/config/locales/gl.yml index 9c734ec..7c6b4b3 100644 --- a/config/locales/gl.yml +++ b/config/locales/gl.yml @@ -868,3 +868,5 @@ gl: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/he.yml b/config/locales/he.yml index c15bd51..f9c926c 100644 --- a/config/locales/he.yml +++ b/config/locales/he.yml @@ -852,3 +852,5 @@ he: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/hu.yml b/config/locales/hu.yml index ddf0550..a78c5ce 100644 --- a/config/locales/hu.yml +++ b/config/locales/hu.yml @@ -873,3 +873,5 @@ label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/it.yml b/config/locales/it.yml index 1bf5c1a..4a3d767 100644 --- a/config/locales/it.yml +++ b/config/locales/it.yml @@ -855,3 +855,5 @@ it: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/ja.yml b/config/locales/ja.yml index ab54db0..0ff9e0f 100644 --- a/config/locales/ja.yml +++ b/config/locales/ja.yml @@ -877,3 +877,5 @@ ja: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/ko.yml b/config/locales/ko.yml index 8b3ad99..d27df3a 100644 --- a/config/locales/ko.yml +++ b/config/locales/ko.yml @@ -908,3 +908,5 @@ ko: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/lt.yml b/config/locales/lt.yml index dfd3bcd..fe4c8eb 100644 --- a/config/locales/lt.yml +++ b/config/locales/lt.yml @@ -878,3 +878,5 @@ lt: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/nl.yml b/config/locales/nl.yml index 33d3854..f481d3b 100644 --- a/config/locales/nl.yml +++ b/config/locales/nl.yml @@ -830,3 +830,5 @@ nl: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/no.yml b/config/locales/no.yml index 104d0cb..2e20571 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -843,3 +843,5 @@ label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/pl.yml b/config/locales/pl.yml index 4dc267c..b97f731 100644 --- a/config/locales/pl.yml +++ b/config/locales/pl.yml @@ -871,3 +871,5 @@ pl: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml index d10820c..ec32915 100644 --- a/config/locales/pt-BR.yml +++ b/config/locales/pt-BR.yml @@ -874,3 +874,5 @@ pt-BR: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/pt.yml b/config/locales/pt.yml index 004e648..02ef3d4 100644 --- a/config/locales/pt.yml +++ b/config/locales/pt.yml @@ -860,3 +860,5 @@ pt: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/ro.yml b/config/locales/ro.yml index 48ae95e..38c8097 100644 --- a/config/locales/ro.yml +++ b/config/locales/ro.yml @@ -845,3 +845,5 @@ ro: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/ru.yml b/config/locales/ru.yml index 4341f51..61c73ed 100644 --- a/config/locales/ru.yml +++ b/config/locales/ru.yml @@ -956,3 +956,5 @@ ru: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/sk.yml b/config/locales/sk.yml index c6cae46..fb5cca3 100644 --- a/config/locales/sk.yml +++ b/config/locales/sk.yml @@ -847,3 +847,5 @@ sk: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/sl.yml b/config/locales/sl.yml index ce9c702..2ec4cfb 100644 --- a/config/locales/sl.yml +++ b/config/locales/sl.yml @@ -844,3 +844,5 @@ sl: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/sr.yml b/config/locales/sr.yml index 3351a57..52db524 100644 --- a/config/locales/sr.yml +++ b/config/locales/sr.yml @@ -863,3 +863,5 @@ label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/sv.yml b/config/locales/sv.yml index d1296ce..9536719 100644 --- a/config/locales/sv.yml +++ b/config/locales/sv.yml @@ -896,3 +896,5 @@ sv: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/th.yml b/config/locales/th.yml index 10d5221..a3838e8 100644 --- a/config/locales/th.yml +++ b/config/locales/th.yml @@ -845,3 +845,5 @@ th: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/tr.yml b/config/locales/tr.yml index 16fea87..8c58be6 100644 --- a/config/locales/tr.yml +++ b/config/locales/tr.yml @@ -875,3 +875,5 @@ tr: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/uk.yml b/config/locales/uk.yml index eadbfd3..4e018fb 100644 --- a/config/locales/uk.yml +++ b/config/locales/uk.yml @@ -844,3 +844,5 @@ uk: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/vi.yml b/config/locales/vi.yml index 43f4e10..1067b46 100644 --- a/config/locales/vi.yml +++ b/config/locales/vi.yml @@ -907,3 +907,5 @@ vi: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml index 26f1829..81faf7d 100644 --- a/config/locales/zh-TW.yml +++ b/config/locales/zh-TW.yml @@ -939,3 +939,5 @@ label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/config/locales/zh.yml b/config/locales/zh.yml index a627ff4..f4609c8 100644 --- a/config/locales/zh.yml +++ b/config/locales/zh.yml @@ -872,3 +872,5 @@ zh: label_version_sharing_tree: With project tree label_version_sharing_none: Not shared error_can_not_archive_project: This project can not be archived + button_duplicate: Duplicate + button_copy_and_follow: Copy and follow diff --git a/public/images/copy.png b/public/images/copy.png index dccaa0614c0018226b20f390d96f269764f18aff..be7a17ba87c9e5810dbde47e014edfbad57d79f6 100644 GIT binary patch literal 1039 zc%17D@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!UWsc&iE~kEVo7Fxo