<%= simple_format instructions.instructions %>
diff --git a/app/views/types/index.html.erb b/app/views/types/index.html.erb
index 34cb65f06d..1b0a3a969f 100644
--- a/app/views/types/index.html.erb
+++ b/app/views/types/index.html.erb
@@ -123,7 +123,7 @@ See doc/COPYRIGHT.rdoc for more details.
<%= reorder_links('type', {:action => 'move', :id => type}) %> |
<% if !type.is_standard? %>
- <%= link_to type, :method => :delete, data: { confirm: t(:text_are_you_sure) }, :class => 'icon-context icon-delete' do %>
+ <%= link_to type, :method => :delete, data: { confirm: t(:text_are_you_sure) }, :class => 'icon icon-delete' do %>
<%= t(:button_delete) %>
<%=h type.name %>
<% end %>
diff --git a/app/views/users/_memberships.html.erb b/app/views/users/_memberships.html.erb
index b305effaab..f98601aec0 100644
--- a/app/views/users/_memberships.html.erb
+++ b/app/views/users/_memberships.html.erb
@@ -95,13 +95,13 @@ See doc/COPYRIGHT.rdoc for more details.
<%= call_hook(:view_users_memberships_table_row, :user => @user, :membership => membership, :roles => roles, :projects => projects )%>
|
<%= link_to_function l(:button_edit), "$('member-#{membership.id}-roles').hide(); $('member-#{membership.id}-roles-form').show(); return false;", :class => 'icon icon-edit' %>
- <%= link_to(l(:button_delete), { :controller => 'users',
+ <%= link_to(l(:button_remove), { :controller => 'users',
:action => 'destroy_membership',
:id => @user,
:membership_id => membership },
:remote => true,
:method => :post,
- :class => 'icon icon-delete') if membership.deletable? %>
+ :class => 'icon icon-remove') if membership.deletable? %>
|
<% end %>
diff --git a/config/locales/js-en.yml b/config/locales/js-en.yml
index 697ee6005b..c44613b4fe 100644
--- a/config/locales/js-en.yml
+++ b/config/locales/js-en.yml
@@ -165,7 +165,7 @@ en:
label_drop_files: Drop files here
label_drop_files_hint: or click to add files
label_remove_file: "Delete %{fileName}"
- label_remove_watcher: "Delete watcher %{name}"
+ label_remove_watcher: "Remove watcher %{name}"
label_remove_all_files: Delete all files
label_add_description: "Add a description for %{file}"
label_upload_notification: "Uploading files for Work package #%{id}: %{subject}"
@@ -436,7 +436,7 @@ en:
notice_bad_request: "Bad Request."
relations:
empty: No relation exists
- delete: Delete relation
+ remove: Remove relation
inplace:
button_edit: "%{attribute}: Edit"
button_save: "%{attribute}: Save"
diff --git a/features/step_definitions/admin_steps.rb b/features/step_definitions/admin_steps.rb
index 41e31bfab9..6f0a95a5e1 100644
--- a/features/step_definitions/admin_steps.rb
+++ b/features/step_definitions/admin_steps.rb
@@ -53,7 +53,7 @@ end
When /^I delete membership to project "(.*?)"$/ do |project|
project = Project.like(project).first
- page.find(:css, '#tab-content-memberships .memberships').find(:xpath, "//tr[contains(.,'#{project.name}')]").find(:css, '.icon-delete').click
+ page.find(:css, '#tab-content-memberships .memberships').find(:xpath, "//tr[contains(.,'#{project.name}')]").find(:css, '.icon-remove').click
end
When /^I edit membership to project "(.*?)" to contain the roles:$/ do |project, roles_table|
diff --git a/frontend/app/templates/components/notification-box.html b/frontend/app/templates/components/notification-box.html
index 114b261016..2fade7aee4 100644
--- a/frontend/app/templates/components/notification-box.html
+++ b/frontend/app/templates/components/notification-box.html
@@ -31,5 +31,5 @@