diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb
index 1840028d..db00e878 100644
--- a/app/controllers/dmsf_controller.rb
+++ b/app/controllers/dmsf_controller.rb
@@ -115,7 +115,7 @@ class DmsfController < ApplicationController
       render :action => 'email_entries'
       return
     end
-    DmsfMailer.send_documents(User.current, @email_params['to'], @email_params['cc'],
+    DmsfMailer.send_documents(@project, User.current, @email_params['to'], @email_params['cc'],
       @email_params['subject'], @email_params['zipped_content'], @email_params['body']).deliver
     File.delete(@email_params['zipped_content'])
     flash[:notice] = l(:notice_email_sent, @email_params['to'])
@@ -190,7 +190,13 @@ class DmsfController < ApplicationController
         deleted_files.each do |f| 
           log_activity(f, 'deleted')
         end
-        DmsfMailer.files_deleted(User.current, deleted_files).deliver
+        begin
+          DmsfMailer.get_notify_users(User.current, deleted_files).each do |u|
+            DmsfMailer.files_deleted(u, deleted_files).deliver
+          end
+        rescue Exception => e
+          Rails.logger.error "Could not send email notifications: #{e.message}"
+        end
       end
       if failed_entries.empty?
         flash[:notice] = l(:notice_entries_deleted)
diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb
index 5b7b9abd..86a7441c 100644
--- a/app/controllers/dmsf_files_controller.rb
+++ b/app/controllers/dmsf_files_controller.rb
@@ -69,87 +69,90 @@ class DmsfFilesController < ApplicationController
 
   #TODO: don't create revision if nothing change
   def create_revision
-    unless params[:dmsf_file_revision]
-      redirect_to :action => 'show', :id => @file
-      return
-    end
-    if @file.locked_for_user?
-      flash[:error] = l(:error_file_is_locked)
-      redirect_to :action => 'show', :id => @file
-    else
-      #TODO: validate folder_id
-      @revision = DmsfFileRevision.new(params[:dmsf_file_revision])
-      
-      @revision.file = @file
-      @revision.project = @file.project
-      last_revision = @file.last_revision
-      @revision.source_revision = last_revision
-      @revision.user = User.current
-      
-      @revision.major_version = last_revision.major_version
-      @revision.minor_version = last_revision.minor_version      
-      version = params[:version].to_i
-      file_upload = params[:file_upload]
-      if file_upload.nil?
-        @revision.disk_filename = last_revision.disk_filename
-        @revision.increase_version(version, false)
-        @revision.mime_type = last_revision.mime_type
-        @revision.size = last_revision.size
+    if params[:dmsf_file_revision]
+      if @file.locked_for_user?
+        flash[:error] = l(:error_file_is_locked)        
       else
-        @revision.increase_version(version, true)
-        @revision.size = file_upload.size
-        @revision.disk_filename = @revision.new_storage_filename
-        @revision.mime_type = Redmine::MimeType.of(file_upload.original_filename)
-      end      
-      
-      @file.name = @revision.name
-      @file.folder = @revision.folder
-      
-      if @revision.valid? && @file.valid?
-        @revision.save!
-        @revision.assign_workflow(params[:dmsf_workflow_id])
-        if file_upload
-          @revision.copy_file_content(file_upload)
-        end
-        
-        if @file.locked? && !@file.locks.empty?
-          begin
-            @file.unlock!
-            flash[:notice] = "#{l(:notice_file_unlocked)}, "
-          rescue Exception => e
-            logger.error "Cannot unlock the file: #{e.message}"
+        #TODO: validate folder_id
+        @revision = DmsfFileRevision.new(params[:dmsf_file_revision])
+
+        @revision.file = @file
+        @revision.project = @file.project
+        last_revision = @file.last_revision
+        @revision.source_revision = last_revision
+        @revision.user = User.current
+
+        @revision.major_version = last_revision.major_version
+        @revision.minor_version = last_revision.minor_version      
+        version = params[:version].to_i
+        file_upload = params[:file_upload]
+        if file_upload.nil?
+          @revision.disk_filename = last_revision.disk_filename
+          @revision.increase_version(version, false)
+          @revision.mime_type = last_revision.mime_type
+          @revision.size = last_revision.size
+        else
+          @revision.increase_version(version, true)
+          @revision.size = file_upload.size
+          @revision.disk_filename = @revision.new_storage_filename
+          @revision.mime_type = Redmine::MimeType.of(file_upload.original_filename)
+        end      
+
+        @file.name = @revision.name
+        @file.folder = @revision.folder
+
+        if @revision.valid? && @file.valid?
+          @revision.save!
+          @revision.assign_workflow(params[:dmsf_workflow_id])
+          if file_upload
+            @revision.copy_file_content(file_upload)
           end
+
+          if @file.locked? && !@file.locks.empty?
+            begin
+              @file.unlock!
+              flash[:notice] = "#{l(:notice_file_unlocked)}, "
+            rescue Exception => e
+              logger.error "Cannot unlock the file: #{e.message}"
+            end
+          end
+          @file.save!
+          @file.set_last_revision @revision
+
+          flash[:notice] = (flash[:notice].nil? ? '' : flash[:notice]) + l(:notice_file_revision_created)
+          log_activity('new revision')
+          begin
+            DmsfMailer.get_notify_users(User.current, [@file]).each do |u|
+              DmsfMailer.files_updated(u, [@file]).deliver
+            end
+          rescue Exception => e
+            logger.error "Could not send email notifications: #{e.message}"
+          end          
         end
-        @file.save!
-        @file.reload
-        
-        flash[:notice] = (flash[:notice].nil? ? '' : flash[:notice]) + l(:notice_file_revision_created)
-        log_activity('new revision')
-        begin
-          DmsfMailer.files_updated(User.current, [@file]).deliver
-        rescue Exception => e
-          logger.error "Could not send email notifications: #{e.message}"
-        end
-        redirect_to :action => 'show', :id => @file
-      else
-        render :action => 'show'
       end
     end
+    redirect_to :back
   end
 
   def delete
     if @file
       if @file.delete
         flash[:notice] = l(:notice_file_deleted)
-        log_activity('deleted')
-        DmsfMailer.files_deleted(User.current, [@file]).deliver
+        log_activity('deleted')        
+        begin
+          DmsfMailer.get_notify_users(User.current, [@file]).each do |u|
+            DmsfMailer.files_deleted(u, [@file]).deliver
+          end
+        rescue Exception => e
+          Rails.logger.error "Could not send email notifications: #{e.message}"
+        end
       else       
         @file.errors.each do |e, msg| 
           flash[:error] = msg         
         end
       end
     end
-    redirect_to :controller => 'dmsf', :action => 'show', :id => @project, :folder_id => @file.folder
+    redirect_to dmsf_folder_path(:id => @project, :folder_id => @file.folder)
   end
 
   def delete_revision
diff --git a/app/controllers/dmsf_files_copy_controller.rb b/app/controllers/dmsf_files_copy_controller.rb
index e080c5a8..5213e3ff 100644
--- a/app/controllers/dmsf_files_copy_controller.rb
+++ b/app/controllers/dmsf_files_copy_controller.rb
@@ -68,14 +68,9 @@ class DmsfFilesCopyController < ApplicationController
     end
 
     flash[:notice] = l(:notice_file_copied)
-    log_activity(new_file, 'was copied (is copy)')
-    begin 
-      DmsfMailer.files_updated(User.current, [new_file]).deliver
-    rescue ActionView::MissingTemplate => e
-      Rails.logger.error "Could not send email notifications: #{e.message}"
-    end
+    log_activity(new_file, 'was copied (is copy)')   
     
-    redirect_to :controller => 'dmsf_files', :action => 'show', :id => new_file
+    redirect_to dmsf_file_path(new_file)
   end
 
   def move
@@ -105,15 +100,9 @@ class DmsfFilesCopyController < ApplicationController
     @file.reload
     
     flash[:notice] = l(:notice_file_moved)
-    log_activity(@file, 'was moved (is copy)')
-    begin
-      # TODO: implement proper mail notification
-      DmsfMailer.files_updated(User.current, [@file]).deliver
-    rescue ActionView::MissingTemplate => e
-      Rails.logger.error "Could not send email notifications: #{e.message}"
-    end
+    log_activity(@file, 'was moved (is copy)')    
     
-    redirect_to :controller => 'dmsf_files', :action => 'show', :id => @file
+    redirect_to dmsf_file_path(@file)
   end
 
   private
diff --git a/app/controllers/dmsf_folders_copy_controller.rb b/app/controllers/dmsf_folders_copy_controller.rb
index dde421a5..3b53ae82 100644
--- a/app/controllers/dmsf_folders_copy_controller.rb
+++ b/app/controllers/dmsf_folders_copy_controller.rb
@@ -69,15 +69,8 @@ class DmsfFoldersCopyController < ApplicationController
     
     flash[:notice] = l(:notice_folder_copied)
     log_activity(new_folder, 'was copied (is copy)')
-    
-    #TODO: implement proper notification for all new files
-    #begin 
-    #  DmsfMailer.files_updated(User.current, [new_file]).deliver
-    #rescue ActionView::MissingTemplate => e
-    #  Rails.logger.error "Could not send email notifications: " + e
-    #end
-    
-    redirect_to :controller => 'dmsf', :action => 'show', :id => @target_project, :folder_id => new_folder
+          
+    redirect_to dmsf_folder_path(:id => @target_project, :folder_id => new_folder)
   end
 
   private
diff --git a/app/controllers/dmsf_upload_controller.rb b/app/controllers/dmsf_upload_controller.rb
index 16b66fba..18b4b36f 100644
--- a/app/controllers/dmsf_upload_controller.rb
+++ b/app/controllers/dmsf_upload_controller.rb
@@ -170,9 +170,11 @@ class DmsfUploadController < ApplicationController
       end
       unless files.empty?        
         files.each { |file| log_activity(file, 'uploaded') if file }        
-        begin 
-          DmsfMailer.files_updated(User.current, files).deliver
-        rescue ActionView::MissingTemplate => e
+        begin
+          DmsfMailer.get_notify_users(User.current, files).each do |u|
+            DmsfMailer.files_updated(u, files).deliver
+          end
+        rescue Exception => e
           Rails.logger.error "Could not send email notifications: #{e.message}"
         end
       end
@@ -180,7 +182,7 @@ class DmsfUploadController < ApplicationController
         flash[:warning] = l(:warning_some_files_were_not_commited, :files => failed_uploads.map{|u| u['name']}.join(', '))
       end
     end
-    redirect_to :controller => 'dmsf', :action => 'show', :id => @project, :folder_id => @folder
+    redirect_to dmsf_folder_path(:id => @project, :folder_id => @folder)
   end
 
   private
diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb
index 8bc52962..cecd287d 100644
--- a/app/models/dmsf_file.rb
+++ b/app/models/dmsf_file.rb
@@ -225,7 +225,7 @@ class DmsfFile < ActiveRecord::Base
     file.name = self.name
     file.notification = Setting.plugin_redmine_dmsf['dmsf_default_notifications'].present?
 
-    if file.save
+    if file.save && self.last_revision
       new_revision = self.last_revision.clone
 
       new_revision.file = file
diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb
index 6b489218..825b91d2 100644
--- a/app/models/dmsf_mailer.rb
+++ b/app/models/dmsf_mailer.rb
@@ -1,6 +1,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright (C) 2011   Vít Jonáš <vit.jonas@gmail.com>
+# Copyright (C) 2011-14 Karel Pičman <karel.picman@kontron.com>
 #
 # This program is free software; you can redistribute it and/or
 # modify it under the terms of the GNU General Public License
@@ -19,47 +20,57 @@
 require 'mailer'
 
 class DmsfMailer < Mailer
+  layout 'mailer'
   
   def files_updated(user, files)
-    project = files[0].project
-    files = files.select { |file| file.notify? }
-    
-    redmine_headers "Project" => project.identifier
+    if user && files.count > 0
+      project = files[0].project
+      files = files.select { |file| file.notify? }
 
-    @user = user
-    @files = files
-    @project = project
+      redmine_headers 'Project' => project.identifier if project
 
-    mail :to => get_notify_user_emails(user, files),
-      :subject =>  "#{project.name}: Dmsf files updated"
+      @user = user
+      @files = files
+      @project = project
+      
+      set_language_if_valid user.language
+      mail :to => user.mail, 
+          :subject =>  l(:text_email_doc_updated_subject, :project => project.name)
+    end
   end
   
   def files_deleted(user, files)
-    project = files[0].project
-    files = files.select { |file| file.notify? }
-    
-    redmine_headers 'Project' => project.identifier
+    if user && files.count > 0
+      project = files[0].project
+      files = files.select { |file| file.notify? }
 
-    @user = user
-    @files = files
-    @project = project
+      redmine_headers 'Project' => project.identifier if project
 
-    mail :to => get_notify_user_emails(user, files),
-      :subject => "#{project.name}: Dmsf files deleted"
+      @user = user
+      @files = files
+      @project = project
+      
+      set_language_if_valid user.language
+      mail :to => user.mail, 
+        :subject =>  l(:text_email_doc_deleted_subject, :project => project.name)
+    end
   end
   
-  def send_documents(user, email_to, email_cc, email_subject, zipped_content, email_plain_body)
+  def send_documents(project, user, email_to, email_cc, email_subject, zipped_content, email_plain_body)
     zipped_content_data = open(zipped_content, 'rb') {|io| io.read }
+    
+    redmine_headers 'Project' => project.identifier if project
 
     @body = email_plain_body
-
+    
     attachments['Documents.zip'] = {:content_type => 'application/zip', :content => zipped_content_data}
-    mail(:to => email_to, :cc => email_cc, :subject => email_subject, :from => user.mail)
+    mail :to => email_to, :cc => email_cc, :subject => email_subject, :from => user.mail
   end
   
   def workflow_notification(user, workflow, revision, subject, text1, text2)
     if user && workflow && revision
-      set_language_if_valid user.language    
+      redmine_headers 'Project' => revision.file.project.identifier if revision.file && revision.file.project
+      set_language_if_valid user.language
       @user = user
       @workflow = workflow
       @revision = revision
@@ -67,17 +78,15 @@ class DmsfMailer < Mailer
       @text2 = text2
       mail :to => user.mail, :subject => subject
     end
-  end
-      
-  private
+  end        
   
-  def get_notify_user_emails(user, files)
+  def self.get_notify_users(user, files)
     return [] if files.empty?
     project = files[0].project    
     notify_members = project.members
     notify_members = notify_members.select do |notify_member|
-      notify_user = notify_member.user      
-      if notify_user.pref[:no_self_notified] == '1' && notify_user == user
+      notify_user = notify_member.user         
+      if notify_user == user && user.pref.no_self_notified
         false
       else
         unless notify_member.dmsf_mail_notification
@@ -97,7 +106,7 @@ class DmsfMailer < Mailer
       end
     end      
 
-    notify_members.collect {|m| m.user.mail }
+    notify_members.collect { |m| m.user }
   end
         
-end
+end
\ No newline at end of file
diff --git a/app/views/dmsf_mailer/files_deleted.html.erb b/app/views/dmsf_mailer/files_deleted.html.erb
index dd528923..3ac0d9c4 100644
--- a/app/views/dmsf_mailer/files_deleted.html.erb
+++ b/app/views/dmsf_mailer/files_deleted.html.erb
@@ -18,13 +18,13 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
 
-<%= link_to @user, user_path(@user, :only_path => false) %> has just deleted documents of 
-<%= link_to @project, project_path(@project, :only_path => false) %> as follows: 
+<%= link_to @user, user_path(@user, :only_path => false) %> <%= l(:text_email_doc_deleted) %>
+<%= link_to @project, project_path(@project, :only_path => false) %> <%= l(:text_email_doc_follows) %>
 <% @files.each do |file| %>
   <p>
     <%= h(file.dmsf_path_str) %> (<%= file.name %>)
     <%  if file.last_revision %>
-      , <%= number_to_human_size(file.last_revision.size) %>, version: <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>
+      , <%= number_to_human_size(file.last_revision.size) %>, <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>
     <% end  %>
   </p>
 <% end %>
diff --git a/app/views/dmsf_mailer/files_deleted.text.erb b/app/views/dmsf_mailer/files_deleted.text.erb
index dc4cebf9..92f9ba4d 100644
--- a/app/views/dmsf_mailer/files_deleted.text.erb
+++ b/app/views/dmsf_mailer/files_deleted.text.erb
@@ -17,11 +17,11 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
-
-<%= @user.name %> has just deleted documents of <%= @project.name %> as follows: 
-<% @files.each do |file| %>
-  <%= file.dmsf_path_str %> (<%= file.name %>)
-  <% if file.last_revision %>
-     , <%= number_to_human_size(file.last_revision.size) %>, version: <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>
-  <% end %>	
+    
+<%= @user.name %> <%= l(:text_email_doc_deleted) %> <%= @project.name %> <%= l(:text_email_doc_follows) %>
+<% @files.each do |file| %>  
+  <%= h(file.dmsf_path_str) %> (<%= file.name %>)
+  <%  if file.last_revision %>
+    , <%= number_to_human_size(file.last_revision.size) %>, <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>
+  <% end  %>  
 <% end %>
\ No newline at end of file
diff --git a/app/views/dmsf_mailer/files_updated.html.erb b/app/views/dmsf_mailer/files_updated.html.erb
index 5a87bd90..046f01bf 100644
--- a/app/views/dmsf_mailer/files_updated.html.erb
+++ b/app/views/dmsf_mailer/files_updated.html.erb
@@ -18,18 +18,18 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
 
-<%= link_to @user, user_path(@user, :only_path => false) %> has just actualized documents of 
-<%= link_to @project, project_path(@project, :only_path => false) %> as follows: 
+<%= link_to @user, user_path(@user, :only_path => false) %> <%= l(:text_email_doc_updated) %>
+<%= link_to @project, project_path(@project, :only_path => false) %> <%= l(:text_email_doc_follows) %>
 <% @files.each do |file| %>
 <p>
   <%= link_to(h(file.dmsf_path_str),
-    {:only_path => false, :controller => 'dmsf_files', :action => 'show', :id => file,
-    :download => ''}) %> (<%= file.name %>),
+    dmsf_file_path(file, :download => '', :only_path => false)) %> 
+  (<%= file.name %>),
   <%= number_to_human_size(file.last_revision.size) %>,
-  version: <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>,
+  <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>,
   <%= "#{file.last_revision.workflow_str(true)}," if file.last_revision.workflow_str(true) != l(:title_none) %>
-  <%= link_to('Details',
-    {:only_path => false, :controller => 'dmsf_files', :action => 'show', :id => file}) %>
+  <%= link_to(l(:link_details, :title => h(file.title)),
+    dmsf_file_path(file, :only_path => false)) %>    
   <% if file.last_revision.comment.present? %>
     <br/><span style="font-size: 0.9em">&nbsp;&nbsp;&nbsp;&nbsp;<em><%= h(file.last_revision.comment) %></em></span>
   <% end %>
diff --git a/app/views/dmsf_mailer/files_updated.text.erb b/app/views/dmsf_mailer/files_updated.text.erb
index 16e1026b..77b49c5d 100644
--- a/app/views/dmsf_mailer/files_updated.text.erb
+++ b/app/views/dmsf_mailer/files_updated.text.erb
@@ -17,15 +17,16 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
-
-<%= @user.name %> has just actualized documents of <%= @project.name %> as follows: 
+    
+<%= @user.name %> <%= l(:text_email_doc_updated) %>
+<%= @project.name %> <%= l(:text_email_doc_follows) %>
 <% @files.each do |file| %>
-  <%= file.dmsf_path_str %> (<%= file.name %>),
+  <%= h(file.dmsf_path_str) %> (<%= file.name %>),  
   <%= number_to_human_size(file.last_revision.size) %>,
-  version: <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>,
+  <%= l(:label_version) %> <%= file.last_revision.major_version %>.<%= file.last_revision.minor_version %>,
   <%= "#{file.last_revision.workflow_str(true)}," if file.last_revision.workflow_str(true) != l(:title_none) %>
-  <%= url_for({:only_path => false, :controller => 'dmsf_files', :action => 'show', :id => file}) %>
+  <%= dmsf_file_path(file, :only_path => false) %>    
   <% if file.last_revision.comment.present? %>
-    comment: <%= h(file.last_revision.comment) %>
+    <%= l(:label_comment) %> <%= h(file.last_revision.comment) %>
   <% end %>
 <% end %>
\ No newline at end of file
diff --git a/app/views/dmsf_mailer/workflow_notification.html.erb b/app/views/dmsf_mailer/workflow_notification.html.erb
index fd759524..95371fc5 100644
--- a/app/views/dmsf_mailer/workflow_notification.html.erb
+++ b/app/views/dmsf_mailer/workflow_notification.html.erb
@@ -23,9 +23,11 @@
 <p>
   <%= @text2 %>      
   <%  unless @revision.folder %>
-    <%= link_to l(:link_documents), {:controller => 'dmsf', :action => 'show', :id=> @revision.file.project, :only_path => false } %>
+    <%= link_to l(:link_documents), 
+      dmsf_folder_path(:id => @revision.file.project, :only_path => false) %>
   <% else %>
-    <%=  link_to @revision.folder.title, {:controller => 'dmsf', :action => 'show', :id=> @revision.file.project, :folder_id => @revision.folder, :only_path => false } %>
+    <%=  link_to @revision.folder.title,
+      dmsf_folder_path(:id => @revision.file.project, :folder_id => @revision.folder, :only_path => false) %>
   <% end %>.
 </p>
   
\ No newline at end of file
diff --git a/app/views/dmsf_mailer/workflow_notification.text.erb b/app/views/dmsf_mailer/workflow_notification.text.erb
index 17fa7989..fe103196 100644
--- a/app/views/dmsf_mailer/workflow_notification.text.erb
+++ b/app/views/dmsf_mailer/workflow_notification.text.erb
@@ -16,10 +16,10 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.%>
 
-<%= @user.name %> ,
+<%= @user.name %>,
 <%= @text1 %>
 <% unless @revision.folder %>
-  <%= @text2 %> <%= url_for(:controller => 'dmsf', :action => 'show', :id => @revision.file.project, :only_path => false) %>.
+  <%= @text2 %> <%= dmsf_folder_path(:id => @revision.file.project, :only_path => false) %>.
 <% else %>
-  <%= @text2 %> <%= url_for(:controller => 'dmsf', :action => 'show', :id => @revision.file.project, :folder_id => @revision.folder, :only_path => false) %>.
+  <%= @text2 %> <%= dmsf_folder_path(:id => @revision.file.project, :folder_id => @revision.folder, :only_path => false) %>.
 <% end %>
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index bbb47fd1..dc929b33 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -109,11 +109,9 @@ cs:
   label_created: Vytvořeno
   label_changed: Změněno
   info_changed_by_user: "%{changed} uživatelem"
-  label_filename: Jméno souboru
-  label_version: Verze  
+  label_filename: Jméno souboru  
   label_mime: Typ
-  label_size: Velikost
-  label_comment: Komentář
+  label_size: Velikost  
   heading_new_revision: Nová revize
   option_version_same: Stejná
   option_version_minor: Podružná
@@ -280,6 +278,12 @@ cs:
   label_notifications_off: Vypnout notifikace
   field_target_file: Cílový soubor
   title_download_entries: Historie stahování
+  
+  text_email_doc_updated_subject: "Dokumenty projektu %{project} aktualizovány"
+  text_email_doc_updated: právě aktualizoval dokumenty projektu
+  text_email_doc_follows: takto
+  text_email_doc_deleted_subject: "Dokumenty projektu %{project} smazány"
+  text_email_doc_deleted: právě smazal dokumety projektu
     
   my:
     blocks:
diff --git a/config/locales/de.yml b/config/locales/de.yml
index ab1da9db..84b150af 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -108,11 +108,9 @@ de:
   label_created: Erstellt
   label_changed: Geändert
   info_changed_by_user: "%{changed} von"
-  label_filename: Dateiname
-  label_version: Version  
+  label_filename: Dateiname  
   label_mime: Mime
-  label_size: Größe
-  label_comment: Kommentar
+  label_size: Größe  
   heading_new_revision: Neue Version
   option_version_same: gleiche Version
   option_version_minor: Unterversion
diff --git a/config/locales/en.yml b/config/locales/en.yml
index c03d1fa0..05d51cce 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -110,12 +110,10 @@ en:
   label_created: Created
   label_changed: Changed
   info_changed_by_user: "%{changed} by"
-  label_filename: Filename
-  label_version: Version
+  label_filename: Filename  
   label_approval_workflow: Workflow
   label_mime: Mime
-  label_size: Size
-  label_comment: Comment
+  label_size: Size  
   heading_new_revision: New Revision
   option_version_same: Same
   option_version_minor: Minor
@@ -285,6 +283,12 @@ en:
   field_target_file: Target file
   title_download_entries: Download entries
   
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
+  
   my:
     blocks:
       locked_documents: Locked documents
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 37ad0e6a..382fcd1f 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -110,11 +110,9 @@ es:
   label_created: Created
   label_changed: Changed
   info_changed_by_user: "%{changed} by"
-  label_filename: Filename
-  label_version: Version  
+  label_filename: Filename  
   label_mime: Mime
-  label_size: Size
-  label_comment: Comment
+  label_size: Size  
   heading_new_revision: New Revision
   option_version_same: Same
   option_version_minor: Minor
@@ -282,6 +280,12 @@ es:
   field_target_file: Target file
   title_download_entries: Download entries
   
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
+  
   my:
     blocks:
       locked_documents: Locked documents
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 111ed0ba..26f45b56 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -110,12 +110,10 @@ fr:
   label_created: Créé
   label_changed: Modifié
   info_changed_by_user: "%{changed} par"
-  label_filename: Fichier
-  label_version: Version  
+  label_filename: Fichier  
   label_approval_workflow: Flux de validation
   label_mime: Type
-  label_size: Taille
-  label_comment: Commentaires
+  label_size: Taille  
   heading_new_revision: Nouvelle révision
   option_version_same: (identique)
   option_version_minor: (modification mineure)
@@ -284,6 +282,12 @@ fr:
   label_notifications_off: Notifications off
   field_target_file: Target file
   title_download_entries: Download entries
+  
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
 
   my:
     blocks:
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index d0c7b0d9..158cdf37 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -108,11 +108,9 @@ ja:
   label_created: 作成者/日時
   label_changed: 更新者/日時
   info_changed_by_user: "/ %{changed}"
-  label_filename: ファイル名
-  label_version: バージョン  
+  label_filename: ファイル名  
   label_mime: Mime
-  label_size: サイズ
-  label_comment: コメント
+  label_size: サイズ  
   heading_new_revision: 新しいリビジョン
   option_version_same: 変更なし
   option_version_minor: マイナー
@@ -282,6 +280,12 @@ ja:
   field_target_file: Target file
   title_download_entries: Download entries
   
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
+  
   my:
     blocks:
       locked_documents: Locked documents
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index b4c019ce..12c61bd0 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -108,11 +108,9 @@ ru:
   label_created: Создан
   label_changed: Изменен
   info_changed_by_user: "%{changed} пользователем"
-  label_filename: Имя файла
-  label_version: Версия  
+  label_filename: Имя файла  
   label_mime: MIME-тип
-  label_size: Размер
-  label_comment: Комментарий
+  label_size: Размер  
   heading_new_revision: Новая редакция
   option_version_same: Та же версия
   option_version_minor: Незначительные изменения
@@ -282,6 +280,12 @@ ru:
   field_target_file: Target file
   title_download_entries: Download entries
   
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
+  
   my:
     blocks:
       locked_documents: Locked documents
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index c1f6019a..87465bb5 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -108,11 +108,9 @@ sl:
   label_created: Narejeno
   label_changed: Spremenjeno
   info_changed_by_user: "%{changed} po"
-  label_filename: Datoteka
-  label_version: Verzija  
+  label_filename: Datoteka  
   label_mime: Mime
-  label_size: Velikost
-  label_comment: Komentar
+  label_size: Velikost  
   heading_new_revision: Nova verzija
   option_version_same: Enako
   option_version_minor: Minor
@@ -282,6 +280,12 @@ sl:
   field_target_file: Target file
   title_download_entries: Download entries
   
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
+  
   my:
     blocks:
       locked_documents: Locked documents
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 3041f241..d781224c 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -108,11 +108,9 @@ zh:
   label_created: 创建
   label_changed: 修改
   info_changed_by_user: "%{changed} by"
-  label_filename: 文件名
-  label_version: 版本  
+  label_filename: 文件名  
   label_mime: Mime
-  label_size: 大小
-  label_comment: 注释
+  label_size: 大小  
   heading_new_revision: 新修订
   option_version_same: Same
   option_version_minor: Minor
@@ -283,6 +281,12 @@ zh:
   field_target_file: Target file
   title_download_entries: Download entries
   
+  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated: has just actualized documents of
+  text_email_doc_follows: as follows
+  text_email_doc_deleted_subject: "Documents of %{project} deleted"
+  text_email_doc_deleted: has just deleted documents of
+  
   my:
     blocks:
       locked_documents: Locked documents