diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index 0d5676dc..b31c580a 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -48,19 +48,19 @@
       <% end %>
     <% end %>
     <% unless @folder.locked? %>
-      <%= link_to(l(:button_delete), delete_dmsf_path(id: @project, folder_id: @folder),
+      <%= link_to l(:button_delete), delete_dmsf_path(id: @project, folder_id: @folder),
         data: { confirm: l(:text_are_you_sure) },
-        title: l(:button_delete), class: 'icon icon-del', method: :delete) %>
+        title: l(:button_delete), class: 'icon icon-del', method: :delete %>
     <% end %>
   <% end %>
 </div>
 
 <% create = @pathfolder == @parent %>
 <%= render partial: 'path',
-           locals: { folder: @pathfolder, filename: create ? l(:heading_new_folder) : nil, title: nil} %>
+           locals: { folder: @pathfolder, filename: create ? l(:heading_new_folder) : nil, title: nil } %>
 
 <%= labelled_form_for(@folder,
-                      url: { action: create ? 'create' : 'save', id: @project, folder_id: @folder, parent_id: @parent},
+                      url: { action: create ? 'create' : 'save', id: @project, folder_id: @folder, parent_id: @parent },
                       html: { method: :post }) do |f| %>
   <%= error_messages_for @folder %>
   <%= f.hidden_field :redirect_to_folder_id, value: @redirect_to_folder_id %>
@@ -94,7 +94,7 @@
           <br/>
         <% end %>
       <% end %>
-      <%= label_tag '', l(:label_permissions) %>
+      <%= label_tag '', l(:label_dmsf_permissions) %>
       <% Role.givable.each do |role| %>
         <% checked = @folder.permission_for_role(role) %>
         <label class="inline">
diff --git a/app/views/dmsf_folder_permissions/_new.html.erb b/app/views/dmsf_folder_permissions/_new.html.erb
index 1d4016e6..39a09036 100644
--- a/app/views/dmsf_folder_permissions/_new.html.erb
+++ b/app/views/dmsf_folder_permissions/_new.html.erb
@@ -20,22 +20,18 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<h3 class="title"><%= l(:label_user_search) %></h3>
-
+<h3 class="title"><%= l(:label_dmsf_permissions) %></h3>
 <%= form_tag(append_dmsf_folder_permissions_path, remote: true, method: :post, id: 'new-user-form') do %>
-    <%= hidden_field_tag :project_id, @project.id %>
-
+  <%= hidden_field_tag :project_id, @project.id %>
   <p><%= label_tag 'user_search', l(:label_user_search) %><%= text_field_tag 'user_search', nil %></p>
   <%= late_javascript_tag "observeSearchfield('user_search', 'users_for_users', '#{ escape_javascript url_for(
     controller: 'dmsf_folder_permissions', action: 'autocomplete_for_user', project_id: @project,
     dmsf_folder_id: @dmsf_folder) }')" %>
-
   <div id="users_for_watcher">
     <%= render_principals_for_new_folder_permissions @principals %>
   </div>
-
   <p class="buttons">
     <%= submit_tag l(:button_add), name: nil, onclick: 'hideModal(this);' %>
-    <%= submit_tag l(:button_cancel), name: nil, onclick: 'hideModal(this);', type: 'button' %>
+    <%= link_to_function l(:button_cancel), "hideModal(this);" %>
   </p>
 <% end %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 77ff1fbf..68ad732f 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -396,7 +396,8 @@ cs:
   text_dmsf_fast_links_info: Při vytváření odkazů budete moci zadat přímo ID cílového adresáře za účelem zrychlení
     procesu vytváření odkazů.
 
-  label_inherited_permissions: Zděděná práva
+  label_dmsf_permissions: Vyhrazený přístup pro
+  label_inherited_permissions: Zděděný přístup pro
 
   button_edit_content: Upravit obsah
   field_workflow: Workflow
diff --git a/config/locales/de.yml b/config/locales/de.yml
index df25eb9d..6200650b 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -397,7 +397,8 @@ de:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Bearbeiten den Inhalt
   field_workflow: Workflow
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 93ac01ab..e65c7443 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -396,7 +396,8 @@ en:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/es.yml b/config/locales/es.yml
index dcb2e8b4..cc813e86 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -396,7 +396,8 @@ es:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 627f5689..b0d81287 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -396,7 +396,8 @@ fr:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index e8b999ff..fbd3efe7 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -395,7 +395,8 @@ hu:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/it.yml b/config/locales/it.yml
index bfce75d0..784a8094 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -396,7 +396,8 @@ it: # Italian strings thx 2 Matteo Arceci!
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 99cf4342..9e83b18c 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -396,7 +396,8 @@ ja:
   text_dmsf_fast_links_info: ターゲットフォルダのIDを手動で入力することで、リンク作成時のプロセスを高速化することができます。
 
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index c393984f..8f2564f3 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -395,7 +395,8 @@ ko:
   label_dmsf_fast_links: 빠른 링크
   text_dmsf_fast_links_info: 링크 생성을 더 빨리할 수 있도록 링크 생성 시에 대상 폴더의 식별자를 직접 입력할 수 있게 됩니다.
 
-  label_inherited_permissions: 상속된 권한
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: 내용 편집
   field_workflow: 작업 흐름
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index cb5623f5..7fff78e6 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -396,7 +396,8 @@ nl:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index e11cdff8..01d72581 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -396,7 +396,8 @@ pl:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 756d79f5..ef51ec46 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -396,7 +396,8 @@ pt-BR:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0a3f6cea..ecb71363 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -396,7 +396,8 @@ ru:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 5e51ca10..a5433a1f 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -396,7 +396,8 @@ sl:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 43081f10..d0226882 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -396,7 +396,8 @@ zh-TW:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 33e73143..62507da8 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -396,7 +396,8 @@ zh:
   text_dmsf_fast_links_info: You will be able to manually enter a target folder's ID when creating links in order to speed
     up the process of creating links.
 
-  label_inherited_permissions: Inherited permissions
+  label_dmsf_permissions: Prohibit Access for
+  label_inherited_permissions: Inherited Access for
 
   button_edit_content: Edit content
   field_workflow: Workflow