diff --git a/app/controllers/dmsf_context_menus_controller.rb b/app/controllers/dmsf_context_menus_controller.rb
index fe923a85..aad0e539 100644
--- a/app/controllers/dmsf_context_menus_controller.rb
+++ b/app/controllers/dmsf_context_menus_controller.rb
@@ -27,6 +27,7 @@ class DmsfContextMenusController < ApplicationController
   before_action :find_folder
   before_action :find_dmsf_file
   before_action :find_dmsf_folder
+  before_action :find_dmsf_project
 
   def dmsf
     if @dmsf_file
@@ -49,6 +50,12 @@ class DmsfContextMenusController < ApplicationController
       @project = @dmsf_link.project
       @allowed = User.current.allowed_to? :file_manipulation, @project
       @email_allowed = false
+    elsif @dmsf_project # project
+      @locked = false
+      @unlockable = false
+      @project = @dmsf_project
+      @allowed = User.current.allowed_to? :view_project_watchers, @project
+      @email_allowed = false
     else # multiple selection
       @project = get_project
       @locked = false
@@ -57,8 +64,12 @@ class DmsfContextMenusController < ApplicationController
           User.current.allowed_to?(:folder_manipulation, @project)
       @email_allowed = User.current.allowed_to?(:email_documents, @project)
     end
+    if params['back_url'].present?
+      @back_url = params['back_url']
+    else
+      @back_url = dmsf_folder_path(id: @project, folder_id: @folder)
+    end
     @notifications = Setting.notified_events.include?('dmsf_legacy_notifications')
-    @back_url = dmsf_folder_path(id: @project, folder_id: @folder)
     render layout: false
   rescue ActiveRecord::RecordNotFound
     render_404
@@ -140,4 +151,12 @@ class DmsfContextMenusController < ApplicationController
     end
   end
 
+  def find_dmsf_project
+    if (params[:ids].present? && (params[:ids].size == 1)) && (!@dmsf_project)
+      if params[:ids][0] =~ /project-(\d+)/
+        @dmsf_project = Project.find_by(id: $1)
+      end
+    end
+  end
+
 end
\ No newline at end of file
diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb
index 948a7ee2..3622a85e 100644
--- a/app/models/dmsf_folder.rb
+++ b/app/models/dmsf_folder.rb
@@ -589,8 +589,8 @@ class DmsfFolder < ActiveRecord::Base
       if title =~ /^\./
         classes << 'dmsf-system'
       else
+        classes << 'hascontextmenu'
         if (type != 'project')
-          classes << 'hascontextmenu'
           classes << 'dmsf-draggable'
         end
         if %(project folder).include?(type)
diff --git a/app/views/dmsf/_query_list.html.erb b/app/views/dmsf/_query_list.html.erb
index ac0d72b0..4eacedc9 100644
--- a/app/views/dmsf/_query_list.html.erb
+++ b/app/views/dmsf/_query_list.html.erb
@@ -27,7 +27,7 @@
   <%= hidden_field_tag 'back_url', url_for(params: request.query_parameters), id: nil %>
   <%= query_columns_hidden_tags(query) %>
   <div class="autoscroll">
-    <table class="list dmsf odd-even <%= query.css_classes %> context_menu-container" data-hascontextmenu="true">
+    <table class="list dmsf odd-even <%= query.css_classes %> context-menu-container" data-hascontextmenu="true">
       <thead>
       <tr>
         <% if defined?(EasyExtensions) %>
diff --git a/app/views/dmsf/_query_rows.erb b/app/views/dmsf/_query_rows.erb
index 094b63c4..8bc58aca 100644
--- a/app/views/dmsf/_query_rows.erb
+++ b/app/views/dmsf/_query_rows.erb
@@ -38,13 +38,13 @@
   <% @idnt ||= 0 %>
   <tr id="<%= id %>" class="<%= cycle('odd', 'even') %> <%= node.css_classes(query.deleted) %> <%= params[:classes] %> <%= @idnt > 0 ? "idnt idnt-#{@idnt}" : nil %>">
     <td class="checkbox hide-when-print">
-      <%= check_box_tag('ids[]', "#{node.type}-#{node.id}", false, id: nil) unless (system || (node.type == 'project')) %>
+      <%= check_box_tag('ids[]', "#{node.type}-#{node.id}", false, id: nil) unless system %>
     </td>
     <% query.inline_columns.each do |column| %>
       <%= content_tag 'td', column_content(column, node), class: column.css_classes %>
     <% end %>
     <td class="buttons">
-      <% unless (system || (node.type == 'project')) %>
+      <% unless system %>
         <% if defined?(EasyExtensions) %>
           <%= link_to '', '#', title: l(:button_actions), class: 'icon-only icon-actions js-contextmenu icon-more-horiz' %>
         <% else %>
diff --git a/app/views/dmsf_context_menus/_project.html.erb b/app/views/dmsf_context_menus/_project.html.erb
index 086b4796..98e10f09 100644
--- a/app/views/dmsf_context_menus/_project.html.erb
+++ b/app/views/dmsf_context_menus/_project.html.erb
@@ -21,6 +21,5 @@
 %>
 
 <li>
-  <%= context_menu_link l(:button_delete), dmsf_link_path(dmsf_link), method: :delete, class: 'icon icon-del',
-                        data: { confirm: l(:text_are_you_sure) }, id: 'dmsf-cm-delete', disabled: !allowed %>
+  <%= render partial: 'dmsf_context_menus/watch', locals: { object: dmsf_project } %>
 </li>
diff --git a/app/views/dmsf_context_menus/dmsf.html.erb b/app/views/dmsf_context_menus/dmsf.html.erb
index 9c6eabc0..dff79742 100644
--- a/app/views/dmsf_context_menus/dmsf.html.erb
+++ b/app/views/dmsf_context_menus/dmsf.html.erb
@@ -33,6 +33,8 @@
                                             notifications: @notifications, back_url: @back_url } %>
   <% elsif @dmsf_link %>
     <%= render partial: 'url', locals: { dmsf_link: @dmsf_link, allowed: @allowed, back_url: @back_url } %>
+  <% elsif @dmsf_project %>
+    <%= render partial: 'project', locals: { dmsf_project: @dmsf_project, allowed: @allowed, back_url: @back_url } %>
   <% else %>
     <%= render partial: 'multiple', locals: { project: @project, folder: @folder, allowed: @allowed,
                                               email_allowed: @email_allowed, back_url: @back_url } %>
diff --git a/app/views/my/blocks/_locked_documents.html.erb b/app/views/my/blocks/_locked_documents.html.erb
index c396d7a5..c1a8982a 100644
--- a/app/views/my/blocks/_locked_documents.html.erb
+++ b/app/views/my/blocks/_locked_documents.html.erb
@@ -20,72 +20,84 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% folders = [] %>
-<% files = [] %>
 <% folders = DmsfFolder.visible.joins(
   'JOIN dmsf_locks ON dmsf_folders.id = dmsf_locks.entity_id').where(
   ['dmsf_locks.entity_type = ? AND dmsf_locks.user_id = ? AND (dmsf_locks.expires_at IS NULL OR dmsf_locks.expires_at > ?)',
-   1, @user.id, Time.current]).all if @user %>
+   1, @user&.id, Time.current]) %>
 <% files = DmsfFile.visible.joins(
   'JOIN dmsf_locks ON dmsf_files.id = dmsf_locks.entity_id').where(
   ['dmsf_locks.entity_type = ? AND dmsf_locks.user_id = ? AND (dmsf_locks.expires_at IS NULL OR dmsf_locks.expires_at > ?)',
-   0, @user.id, Time.current]).all if @user %>
-<% unless defined?(EasyExtensions) %>
-  <h3><%= l(:locked_documents)%> (<%= folders.count %>/<%=  files.count %>)</h3>
-<% end %>
+   0, @user&.id, Time.current]) %>
+<h3><%= l(:locked_documents)%> (<%= folders.all.size %>/<%= files.all.size %>)</h3>
 <% if folders.any? || files.any?%>
-  <%= form_tag({}) do %>
-    <table class="list">
+  <%= form_tag({}, data: { cm_url: dmsf_context_menu_path(back_url: my_page_path) }) do %>
+    <table class="list context-menu-container" data-hascontextmenu="true">
       <thead>
         <tr>
+          <th class="checkbox hide-when-print">
+            <%= check_box_tag 'check_all', '', false, class: 'toggle-selection',
+                              title: "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+          </th>
           <th><%= l(:field_project) %></th>
           <th><%= l(:label_document) %>/<%= l(:field_folder) %></th>
           <th><%= l(:field_folder) %></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
         <% folders.each do |folder| %>
-          <tr id="folder-<%= folder.id %>">
+          <tr id="folder-<%= folder.id %>" class="hascontextmenu">
+            <td class="checkbox hide-when-print">
+              <%= check_box_tag 'ids[]', "folder-#{folder.id}", false, id: nil %>
+            </td>
             <td class="project">
-              <%= link_to_project(folder.project) %>
+              <%= link_to_project folder.project %>
             </td>
             <td class="title">
-              <%= link_to h(folder.title), { controller: 'dmsf', action: 'show', id: folder.project, folder_id: folder},
+              <%= link_to h(folder.title), dmsf_folder_path(id: folder.project, folder_id: folder),
                 class: 'icon icon-folder' %>
              </td>
              <td class="title">
                <% if folder.dmsf_folder %>
                  <%= link_to h(folder.dmsf_folder.title),
-                    { controller: 'dmsf', action: 'show', id: folder.project, folder_id: folder.dmsf_folder } %>
+                             dmsf_folder_path(id: folder.project, folder_id: folder.dmsf_folder) %>
                <% else %>
-                  <%= link_to l(:link_documents), { controller: 'dmsf', action: 'show', id: folder.project } %>
+                  <%= link_to l(:link_documents), dmsf_folder_path(id: folder.project) %>
                <% end %>
              </td>
+             <td>
+               <%= link_to_context_menu %>
+             </td>
            </tr>
         <% end %>
         <% files.each do |file| %>
-          <tr id="file-<%= file.id %>">
+          <tr id="file-<%= file.id %>" class="hascontextmenu">
+            <td class="checkbox hide-when-print">
+              <%= check_box_tag 'ids[]', "file-#{file.id}", false, id: nil %>
+            </td>
             <td class="project">
-              <%= link_to_project(file.project) if file.project %>
+              <%= link_to_project file.project %>
             </td>
             <td class="title">
-              <%= link_to h(file.title), { controller: 'dmsf_files', action: :show, id: file },
+              <%= link_to h(file.title), dmsf_file_path(id: file),
                 class: "icon icon-file #{DmsfHelper.filetype_css(file.name)}" %>
             </td>
              <td class="title">
                <% if file.dmsf_folder %>
-                 <%= link_to h(file.dmsf_folder.title),
-                    { controller: 'dmsf', action: 'show', id: file.project, folder_id: file.dmsf_folder } %>
+                 <%= link_to h(file.dmsf_folder.title), dmsf_folder_path(id: file.project, folder_id: file.dmsf_folder) %>
                <% else %>
-                  <%= link_to_if file.project, l(:link_documents),
-                                 { controller: 'dmsf', action: 'show', id: file.project } %>
+                  <%= link_to_if file.project, l(:link_documents), dmsf_folder_path(id: file.project) %>
                <% end %>
              </td>
+             <td>
+               <%= link_to_context_menu %>
+             </td>
            </tr>
         <% end %>
       </tbody>
     </table>
   <% end %>
+  <%= context_menu %>
 <% else %>
   <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
diff --git a/app/views/my/blocks/_watched_documents.html.erb b/app/views/my/blocks/_watched_documents.html.erb
index c396d7a5..c65b28fe 100644
--- a/app/views/my/blocks/_watched_documents.html.erb
+++ b/app/views/my/blocks/_watched_documents.html.erb
@@ -20,72 +20,99 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% folders = [] %>
-<% files = [] %>
-<% folders = DmsfFolder.visible.joins(
-  'JOIN dmsf_locks ON dmsf_folders.id = dmsf_locks.entity_id').where(
-  ['dmsf_locks.entity_type = ? AND dmsf_locks.user_id = ? AND (dmsf_locks.expires_at IS NULL OR dmsf_locks.expires_at > ?)',
-   1, @user.id, Time.current]).all if @user %>
-<% files = DmsfFile.visible.joins(
-  'JOIN dmsf_locks ON dmsf_files.id = dmsf_locks.entity_id').where(
-  ['dmsf_locks.entity_type = ? AND dmsf_locks.user_id = ? AND (dmsf_locks.expires_at IS NULL OR dmsf_locks.expires_at > ?)',
-   0, @user.id, Time.current]).all if @user %>
-<% unless defined?(EasyExtensions) %>
-  <h3><%= l(:locked_documents)%> (<%= folders.count %>/<%=  files.count %>)</h3>
-<% end %>
-<% if folders.any? || files.any?%>
-  <%= form_tag({}) do %>
-    <table class="list">
+<% projects = Project.visible.has_module(:dmsf).joins(:watchers).where(
+  :watchers => { watchable_type: 'Project', user_id: @user&.id }) %>
+<% folders = DmsfFolder.visible(:dmsf).joins(:watchers).where(
+  :watchers => { watchable_type: 'DmsfFolder', user_id: @user&.id }) %>
+<% files = DmsfFile.visible.joins(:watchers).where(
+  :watchers => { watchable_type: 'DmsfFile', user_id: @user&.id }) %>
+<h3><%= l(:label_dmsf_watched)%> (<%= projects.all.size + folders.all.size %>/<%=  files.all.size %>)</h3>
+<% if projects.any? || folders.any? || files.any? %>
+  <%= form_tag({}, data: { cm_url: dmsf_context_menu_path(back_url: my_page_path) }) do %>
+    <table class="list context-menu-container" data-hascontextmenu="true">
       <thead>
         <tr>
+          <th class="checkbox hide-when-print">
+            <%= check_box_tag 'check_all', '', false, class: 'toggle-selection',
+                              title: "#{l(:button_check_all)}/#{l(:button_uncheck_all)}" %>
+          </th>
           <th><%= l(:field_project) %></th>
           <th><%= l(:label_document) %>/<%= l(:field_folder) %></th>
           <th><%= l(:field_folder) %></th>
+          <th></th>
         </tr>
       </thead>
       <tbody>
-        <% folders.each do |folder| %>
-          <tr id="folder-<%= folder.id %>">
+        <% projects.each do |project| %>
+          <tr id="project-<%= project.id %>" class="hascontextmenu">
+            <td class="checkbox hide-when-print">
+              <%= check_box_tag 'ids[]', "project-#{project.id}", false, id: nil %>
+            </td>
             <td class="project">
-              <%= link_to_project(folder.project) %>
+              <%= link_to_project project %>
             </td>
             <td class="title">
-              <%= link_to h(folder.title), { controller: 'dmsf', action: 'show', id: folder.project, folder_id: folder},
-                class: 'icon icon-folder' %>
+              <%= link_to_project project, jump: 'dmsf', class: 'project' %>
+            </td>
+            <td class="title"></td>
+            <td>
+              <%= link_to_context_menu %>
+            </td>
+          </tr>
+        <% end %>
+        <% folders.each do |folder| %>
+          <tr id="folder-<%= folder.id %>" class="hascontextmenu">
+            <td class="checkbox hide-when-print">
+              <%= check_box_tag 'ids[]', "folder-#{folder.id}", false, id: nil %>
+            </td>
+            <td class="project">
+              <%= link_to_project folder.project %>
+            </td>
+            <td class="title">
+              <%= link_to h(folder.title), dmsf_folder_path(id: folder.project, folder_id: folder),
+                          class: 'icon icon-folder' %>
              </td>
              <td class="title">
                <% if folder.dmsf_folder %>
-                 <%= link_to h(folder.dmsf_folder.title),
-                    { controller: 'dmsf', action: 'show', id: folder.project, folder_id: folder.dmsf_folder } %>
+                 <%= link_to h(folder.dmsf_folder.title), dmsf_folder_path(id: folder.project, folder_id:
+                   folder.dmsf_folder) %>
                <% else %>
-                  <%= link_to l(:link_documents), { controller: 'dmsf', action: 'show', id: folder.project } %>
+                  <%= link_to l(:link_documents), dmsf_folder_path(id: folder.project) %>
                <% end %>
              </td>
+            <td>
+              <%= link_to_context_menu %>
+            </td>
            </tr>
         <% end %>
         <% files.each do |file| %>
-          <tr id="file-<%= file.id %>">
+          <tr id="file-<%= file.id %>" class="hascontextmenu">
+            <td class="checkbox hide-when-print">
+              <%= check_box_tag 'ids[]', "file-#{file.id}", false, id: nil %>
+            </td>
             <td class="project">
               <%= link_to_project(file.project) if file.project %>
             </td>
             <td class="title">
-              <%= link_to h(file.title), { controller: 'dmsf_files', action: :show, id: file },
+              <%= link_to h(file.title), dmsf_file_path(id: file),
                 class: "icon icon-file #{DmsfHelper.filetype_css(file.name)}" %>
             </td>
-             <td class="title">
-               <% if file.dmsf_folder %>
-                 <%= link_to h(file.dmsf_folder.title),
-                    { controller: 'dmsf', action: 'show', id: file.project, folder_id: file.dmsf_folder } %>
-               <% else %>
-                  <%= link_to_if file.project, l(:link_documents),
-                                 { controller: 'dmsf', action: 'show', id: file.project } %>
-               <% end %>
-             </td>
+            <td class="title">
+              <% if file.dmsf_folder %>
+                <%= link_to h(file.dmsf_folder.title), dmsf_folder_path(id: file.project, folder_id: file.dmsf_folder) %>
+              <% else %>
+                <%= link_to l(:link_documents), dmsf_folder_path(id: file.project) %>
+              <% end %>
+            </td>
+            <td>
+              <%= link_to_context_menu %>
+            </td>
            </tr>
         <% end %>
       </tbody>
     </table>
   <% end %>
+  <%= context_menu %>
 <% else %>
   <p class="nodata"><%= l(:label_no_data) %></p>
 <% end %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 0abea358..d80414cb 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -425,6 +425,21 @@ cs:
   title_start_minor: Zahájení není dovoleno, podružná verze musí být nula
   title_approval_minor: Schválení není dovoleno, podružná verze musí být nula
 
+  label_project_watchers: Sledující uživatelé
+  label_dmsf_folder_watchers: Sledující uživatelé
+  label_dmsf_file_watchers: Sledující uživatelé
+  label_dmsf_watched: Sledované dokumenty
+  dmsf_legacy_notifications: Původní DMS notifikace
+  permission_view_dmsf_folder_watchers: Zobrazit sledující složky
+  permission_add_dmsf_folder_watchers: Přidat sledujícího složky
+  permission_delete_dmsf_folder_watchers: Smazat sledující složky
+  permission_view_dmsf_file_watchers: Zobrazit sledující dokumentu
+  permission_add_dmsf_file_watchers: Přidat sledujícího dokumentu
+  permission_delete_dmsf_file_watchers: Smazat sledující dokumentu
+  permission_view_project_watchers: Zobrazit sledující projektu
+  permission_add_project_watchers: Přidat sledujícího projektu
+  permission_delete_project_watchers: Smazat sledující projektu
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 58a910e1..4a7d401d 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -421,6 +421,21 @@ de:
   title_start_minor: Start nicht erlaubt, Unterversion muss Null lauten
   title_approval_minor: Genehmigung nicht erlaubt, Unterversion muss Null lauten
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: Von mir gesperrte Dokumente
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 36eb1994..976e0bef 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -428,6 +428,7 @@ en:
   label_project_watchers: Watchers
   label_dmsf_folder_watchers: Watchers
   label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
   dmsf_legacy_notifications: Legacy DMS notifications
   permission_view_dmsf_folder_watchers: View folder's watchers
   permission_add_dmsf_folder_watchers: Add folder's watchers
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3bc59bf7..5db31a20 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -425,6 +425,21 @@ es:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 39bdf8ac..2bdb22d5 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -425,6 +425,21 @@ fr:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/hu.yml b/config/locales/hu.yml
index 163f3d1d..9b6bb6e6 100644
--- a/config/locales/hu.yml
+++ b/config/locales/hu.yml
@@ -424,6 +424,21 @@ hu:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 416e2521..e00290cf 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -425,6 +425,21 @@ it: # Italian strings thx 2 Matteo Arceci!
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 0e9fcf13..c08d418e 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -426,6 +426,21 @@ ja:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: 自分がロック中の文書
diff --git a/config/locales/ko.yml b/config/locales/ko.yml
index a04a17c0..5ca274ff 100644
--- a/config/locales/ko.yml
+++ b/config/locales/ko.yml
@@ -425,6 +425,21 @@ ko:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: 내 잠긴 파일
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index d08d18d3..a418cc3e 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -425,6 +425,21 @@ nl:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index d168def0..0cd212ce 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -425,6 +425,21 @@ pl:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index 33e6e9ec..8cebada6 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -425,6 +425,21 @@ pt-BR:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 8c178241..d923dcec 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -425,6 +425,21 @@ ru:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: Мои заблокированные документы
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index d479e44a..044401e8 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -425,6 +425,21 @@ sl:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index b3cacf94..17e25207 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -424,6 +424,21 @@ zh-TW:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index ed6d7c25..4597b03a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -425,6 +425,21 @@ zh:
   title_start_minor: Start not allowed, minor must be zero
   title_approval_minor: Approval not allowed, minor must be zero
 
+  label_project_watchers: Watchers
+  label_dmsf_folder_watchers: Watchers
+  label_dmsf_file_watchers: Watchers
+  label_dmsf_watched: Watched documents
+  dmsf_legacy_notifications: Legacy DMS notifications
+  permission_view_dmsf_folder_watchers: View folder's watchers
+  permission_add_dmsf_folder_watchers: Add folder's watchers
+  permission_delete_dmsf_folder_watchers: Delete folder's watchers
+  permission_view_dmsf_file_watchers: View document's watchers
+  permission_add_dmsf_file_watchers: Add document's watchers
+  permission_delete_dmsf_file_watchers: Delete document's watchers
+  permission_view_project_watchers: View project's watchers
+  permission_add_project_watchers: Add project's watchers
+  permission_delete_project_watchers: Delete project's watchers
+
   easy_pages:
     modules:
       dmsf_locked_documents: My locked documents