From 2dad76503f70b91c0d4dff09bdc5f4cd19a88ab3 Mon Sep 17 00:00:00 2001
From: Karel Picman <karel.picman@kontron.com>
Date: Mon, 22 Feb 2016 13:39:16 +0100
Subject: [PATCH] Email notification subject in Redmine format

---
 app/models/dmsf_mailer.rb | 40 ++++++++++++++++-----------------------
 config/locales/cs.yml     | 16 ++++++++--------
 config/locales/de.yml     | 16 ++++++++--------
 config/locales/en.yml     | 16 ++++++++--------
 config/locales/es.yml     | 16 ++++++++--------
 config/locales/fr.yml     | 16 ++++++++--------
 config/locales/ja.yml     | 16 ++++++++--------
 config/locales/pl.yml     | 16 ++++++++--------
 config/locales/pt-BR.yml  | 16 ++++++++--------
 config/locales/ru.yml     | 16 ++++++++--------
 config/locales/sl.yml     | 16 ++++++++--------
 config/locales/zh-TW.yml  | 16 ++++++++--------
 config/locales/zh.yml     | 16 ++++++++--------
 13 files changed, 112 insertions(+), 120 deletions(-)

diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb
index 5b338627..42d7516c 100644
--- a/app/models/dmsf_mailer.rb
+++ b/app/models/dmsf_mailer.rb
@@ -3,7 +3,7 @@
 # Redmine plugin for Document Management System "Features"
 #
 # Copyright (C) 2011    Vít Jonáš <vit.jonas@gmail.com>
-# Copyright (C) 2011-15 Karel Pičman <karel.picman@kontron.com>
+# Copyright (C) 2011-16 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
@@ -27,48 +27,39 @@ class DmsfMailer < Mailer
   def files_updated(user, project, files)
     if user && project && files.count > 0      
       files = files.select { |file| file.notify? }
-
-      redmine_headers 'Project' => project.identifier if project
-      
+      redmine_headers 'Project' => project.identifier if project      
       @files = files
-      @project = project
-      
+      @project = project      
       set_language_if_valid user.language
-      mail :to => user.mail, 
-          :subject =>  l(:text_email_doc_updated_subject, :project => project.name)
+      mail :to => user.mail,           
+        :subject => "[#{@project.name} - #{l(:menu_dmsf)}] #{l(:text_email_doc_updated_subject)}"
     end
   end
   
   def files_deleted(user, project, files)
     if user && files.count > 0      
       files = files.select { |file| file.notify? }
-
-      redmine_headers 'Project' => project.identifier if project
-      
+      redmine_headers 'Project' => project.identifier if project      
       @files = files
-      @project = project
-      
+      @project = project      
       set_language_if_valid user.language
-      mail :to => user.mail, 
-        :subject =>  l(:text_email_doc_deleted_subject, :project => project.name)
+      mail :to => user.mail,         
+        :subject => "[#{@project.name} - #{l(:menu_dmsf)}] #{l(:text_email_doc_deleted_subject)}"
     end
   end
     
   def send_documents(project, user, email_params)    
-    zipped_content_data = open(email_params[:zipped_content], 'rb') { |io| io.read }
-    
+    zipped_content_data = open(email_params[:zipped_content], 'rb') { |io| io.read }    
     redmine_headers 'Project' => project.identifier if project
-
     @body = email_params[:body]
     @links_only = email_params[:links_only]
     @folders = email_params[:folders]
-    @files = email_params[:files]
-    
+    @files = email_params[:files]    
     unless @links_only == '1'
       attachments['Documents.zip'] = { :content_type => 'application/zip', :content => zipped_content_data }
-    end
-    
-    mail :to => email_params[:to], :cc => email_params[:cc], :subject => email_params[:subject], :from => user.mail
+    end    
+    mail :to => email_params[:to], :cc => email_params[:cc], 
+      :subject => email_params[:subject], :from => user.mail
   end
   
   def workflow_notification(user, workflow, revision, subject_id, text1_id, text2_id, notice = nil)
@@ -84,7 +75,8 @@ class DmsfMailer < Mailer
       @text1 = l(text1_id, :name => workflow.name, :filename => revision.file.name, :notice => notice)      
       @text2 = l(text2_id)
       @notice = notice
-      mail :to => user.mail, :subject => l(subject_id, :name => workflow.name)
+      mail :to => user.mail, 
+        :subject => "[#{@project.name} - #{l(:field_label_dmsf_workflow)}] #{@workflow.name} #{l(subject_id)}"
     end
   end        
   
diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 335b1165..b128632a 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -267,12 +267,12 @@ cs:
   info_revision: "r%{rev}"
   link_workflow: Schvalovací proces
   notice_workflow_started: Schvalovací proces byl úspěšně zahájen
-  text_email_subject_approved: "Schvalovací proces %{name} schválen"
-  text_email_subject_rejected: "Schvalovací proces %{name} zamítnut"
-  text_email_subject_delegated: "Schvalovací proces %{name} delegován"
-  text_email_subject_requires_approval: "Schvalovací proces %{name} očekává Vaše schválení"
-  text_email_subject_updated: "Schvalovací proces %{name} aktualizován"
-  text_email_subject_started: "Schvalovací proces %{name} spuštěn" 
+  text_email_subject_approved: schválen
+  text_email_subject_rejected: zamítnut
+  text_email_subject_delegated: delegován
+  text_email_subject_requires_approval: očekává Vaše schválení
+  text_email_subject_updated: aktualizován
+  text_email_subject_started: spuštěn
   text_email_finished_approved: "Schvalovací proces '%{name}' přiřazený k dokumentu '%{filename}' byl právě ukončen a dokument je schválen."
   text_email_finished_rejected: "Schvalovací proces '%{name}' přiřazený k dokumentu '%{filename}' byl dokončen a dokument byl zamítnut, protože '%{notice}'."
   text_email_finished_delegated: "Schvalovací proces '%{name}' přiřazený k dokumentu '%{filename}' byl delegován, protože '%{notice}' a od Vás se očekává schválení v aktuálním schvalovacím kroku."
@@ -301,10 +301,10 @@ cs:
   label_target_project: Cílový projekt
   label_source_project: Zdrojový projekt  
   
-  text_email_doc_updated_subject: "Dokumenty projektu %{project} aktualizovány"
+  text_email_doc_updated_subject: Dokumenty 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_subject: Dokumenty smazány
   text_email_doc_deleted: právě smazal dokumety projektu
   label_links_only: pouze odkazy  
   
diff --git a/config/locales/de.yml b/config/locales/de.yml
index 151e3256..ba799217 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -267,12 +267,12 @@ de:
   info_revision: "r%{rev}"
   link_workflow: Workflow  
   notice_workflow_started: Genehmigungs-Workflow gestartet
-  text_email_subject_approved: "Genehmigungs-Workflow %{name} genehmigt"
-  text_email_subject_rejected: "Genehmigungs-Workflow %{name} abgelehnt"
-  text_email_subject_delegated: "Genehmigungs-Workflow %{name} deligiert"
-  text_email_subject_requires_approval: "Genehmigungs-Workflow %{name} benötigt deine Genehmigung"
-  text_email_subject_updated: "Genehmigungs-Workflow %{name} bearbeitet"
-  text_email_subject_started: "Genehmigungs-Workflow %{name} gestartet" 
+  text_email_subject_approved: genehmigt
+  text_email_subject_rejected: abgelehnt
+  text_email_subject_delegated: deligiert
+  text_email_subject_requires_approval: benötigt deine Genehmigung
+  text_email_subject_updated: bearbeitet
+  text_email_subject_started: gestartet
   text_email_finished_approved: "Der Genehmigungs-Workflow '%{name}' zugewiesen an die Datei '%{filename}' ist abgeschlossen und die Datei wurde genehmigt."
   text_email_finished_rejected: "Der Genehmigungs-Workflow '%{name}' zugewiesen an die Datei '%{filename}' ist abgeschlossen, aber die Datei wurde abgelehnt, weil: '%{notice}'."
   text_email_finished_delegated: "Der Genehmigungs-Workflow '%{name}' zugewiesen an die Datei '%{filename}' wurde an dich deligiert, weil: '%{notice}' und weil deine Zustimmung im aktuellen Genehmigungsschritt benötigt wird."
@@ -301,10 +301,10 @@ de:
   label_target_project: Zielprojekt
   label_source_project: Quellprojekt  
   
-  text_email_doc_updated_subject: "Dokumente im Projekt %{project} wurden aktualisiert"
+  text_email_doc_updated_subject: Dokumente wurden aktualisiert
   text_email_doc_updated: hat folgende Dokumente bearbeitet
   text_email_doc_follows: wie folgt
-  text_email_doc_deleted_subject: "Dokumente im Projekt %{project} wurden gelöscht"
+  text_email_doc_deleted_subject: Dokumente wurden gelöscht
   text_email_doc_deleted: hat folgende Dokumente gelöscht
   label_links_only: nur Verknüpfungen  
   
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 764a2440..35a2a1e3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -267,12 +267,12 @@ en:
   info_revision: "r%{rev}"
   link_workflow: Workflow
   notice_workflow_started: Approval workflow successfully started  
-  text_email_subject_approved: "Approval workflow %{name} approved"
-  text_email_subject_rejected: "Approval workflow %{name} rejected"
-  text_email_subject_delegated: "Approval workflow %{name} delegated"
-  text_email_subject_requires_approval: "Approval workflow %{name} requires your approval"
-  text_email_subject_updated: "Approval workflow %{name} updated"
-  text_email_subject_started: "Approval workflow %{name} started" 
+  text_email_subject_approved: approved
+  text_email_subject_rejected: rejected
+  text_email_subject_delegated: delegated
+  text_email_subject_requires_approval: requires your approval
+  text_email_subject_updated: updated
+  text_email_subject_started: started
   text_email_finished_approved: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been approved."
   text_email_finished_rejected: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been rejected because of '%{notice}'."
   text_email_finished_delegated: "The approval workflow '%{name}' assigned to '%{filename}' document has just been delegated because of '%{notice}' and you are expected to do an approval in the current approval step."
@@ -301,10 +301,10 @@ en:
   label_target_project: Target project
   label_source_project: Source project
   
-  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated_subject: Documents 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_subject: Documents deleted
   text_email_doc_deleted: has just deleted documents of
   label_links_only: links only  
   
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9101df95..7cf07310 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -267,12 +267,12 @@ es:
   info_revision: "r%{rev}"
   link_workflow: Flujo de Trabajo  
   notice_workflow_started: "Flujo de trabajo de aprobación iniciado satisfactoriamente"
-  text_email_subject_approved: "Flujo de trabajo de aprobación %{name} aprobado"
-  text_email_subject_rejected: "Flujo de trabajo de aprobación %{name} rechazado"
-  text_email_subject_delegated: "Flujo de trabajo de aprobación %{name} delegado"
-  text_email_subject_requires_approval: "Flujo de trabajo de aprobación %{name} requiere su aprobación"
-  text_email_subject_updated: "Flujo de trabajo de aprobación %{name} actualizado"
-  text_email_subject_started: "Flujo de trabajo de aprobación %{name} comenzado" 
+  text_email_subject_approved: aprobado
+  text_email_subject_rejected: rechazado
+  text_email_subject_delegated: delegado
+  text_email_subject_requires_approval: requiere su aprobación
+  text_email_subject_updated: actualizado
+  text_email_subject_started: comenzado
   text_email_finished_approved: "El flujo de trabajo de aprobación '%{name}' asignado al documento '%{filename}' acaba de ser terminado y él ha sido aprobado."
   text_email_finished_rejected: "El flujo de trabajo de aprobación '%{name}' asignado al documento '%{filename}' acaba de ser terminado y él ha sido rechazado por el siguiente motivo '%{notice}'."
   text_email_finished_delegated: "El flujo de trabajo de aprobación '%{name}' asignado al documento '%{filename}' acaba de ser delegado por '%{notice}' y se espera que haga una aprobación en la etapa de aprobación actual."
@@ -301,10 +301,10 @@ es:
   label_target_project: Proyecto destino
   label_source_project: Proyecto fuente  
   
-  text_email_doc_updated_subject: "Documentos de %{project} actualizados"
+  text_email_doc_updated_subject: Documentos actualizados
   text_email_doc_updated: acaba de actualizar los ducumentos de
   text_email_doc_follows: lo siguiente
-  text_email_doc_deleted_subject: "Documentos de %{project} eliminados"
+  text_email_doc_deleted_subject: Documentos eliminados
   text_email_doc_deleted: acaba de eliminar documentos de
   label_links_only: Solo enlaces
   
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index e6a72410..5749c4ce 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -267,12 +267,12 @@ fr:
   info_revision: "r%{rev}"
   link_workflow: Flux  
   notice_workflow_started: Flux de validation démarré avec succès
-  text_email_subject_approved: "Flux de validation %{name} approuvé"
-  text_email_subject_rejected: "Flux de validation %{name} rejeté"
-  text_email_subject_delegated: "Flux de validation %{name} délégué"
-  text_email_subject_requires_approval: "Flux de validation %{name} requiert votre approbation"
-  text_email_subject_updated: "Flux de validation %{name} mis à jour"
-  text_email_subject_started: "Flux de validation %{name} démarré" 
+  text_email_subject_approved: approuvé
+  text_email_subject_rejected: rejeté
+  text_email_subject_delegated: délégué
+  text_email_subject_requires_approval: requiert votre approbation
+  text_email_subject_updated: mis à jour
+  text_email_subject_started: démarré
   text_email_finished_approved: "Le flux de validation '%{name}' assigné au document '%{filename}' vient de se terminer et le document a été approuvé."
   text_email_finished_rejected: "Le flux de validation '%{name}' assigné au document '%{filename}' vient de se terminer et le document a été rejeté pour la raison '%{notice}'."
   text_email_finished_delegated: "Le flux de validation '%{name}' assigné au document '%{filename}' a été délégué pour la raison '%{notice}' et vous êtes tenu d'approuver l'étape actuelle."
@@ -301,10 +301,10 @@ fr:
   label_target_project: Projet cible
   label_source_project: Projet source  
   
-  text_email_doc_updated_subject: "Documents de %{project} mis à jour"
+  text_email_doc_updated_subject: Documents mis à jour
   text_email_doc_updated: a mis à jour des documents de
   text_email_doc_follows: comme suit
-  text_email_doc_deleted_subject: "Documents de %{project} supprimés"
+  text_email_doc_deleted_subject: Documents supprimés
   text_email_doc_deleted: a supprimé des documents de
   label_links_only: liens seulement  
   
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 3e8fe905..1d00865a 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -267,12 +267,12 @@ ja:
   info_revision: "r%{rev}"
   link_workflow: ワークフロー  
   notice_workflow_started: 承認ワークフローが開始されました
-  text_email_subject_approved: "承認ワークフロー '%{name}' は承認されました"
-  text_email_subject_rejected: "承認ワークフロー '%{name}' は否認されました"
-  text_email_subject_delegated: "承認ワークフロー '%{name}' は代理承認が設定されました"
-  text_email_subject_requires_approval: "承認ワークフロー '%{name}' はあなたの承認待ちです"
-  text_email_subject_updated: "承認ワークフロー '%{name}' が更新されました"
-  text_email_subject_started: "承認ワークフロー '%{name}' が開始されました" 
+  text_email_subject_approved: は承認されました
+  text_email_subject_rejected: は否認されました
+  text_email_subject_delegated: は代理承認が設定されました
+  text_email_subject_requires_approval: はあなたの承認待ちです
+  text_email_subject_updated: が更新されました
+  text_email_subject_started: が開始されました"
   text_email_finished_approved: "承認ワークフロー '%{name}' において '%{filename}' が承認されました。"
   text_email_finished_rejected: "承認ワークフロー '%{name}' において '%{filename}' が否認されました。理由：'%{notice}'。"
   text_email_finished_delegated: "承認ワークフロー '%{name}' において代理承認が依頼されました。承認対象 '%{filename}' の内容をご確認の上、承認・否認のご判断をお願い致します（依頼主コメント：'%{notice}'）。"
@@ -301,10 +301,10 @@ ja:
   label_target_project: リンク先プロジェクト
   label_source_project: リンク元プロジェクト  
   
-  text_email_doc_updated_subject: "プロジェクト'%{project}'のファイルが更新されました"
+  text_email_doc_updated_subject: プロジェクトのファイルが更新されました
   text_email_doc_updated: が次のファイルを更新しました。
   text_email_doc_follows: 対象ファイル：
-  text_email_doc_deleted_subject: "プロジェクト'%{project}'のファイルが削除されました"
+  text_email_doc_deleted_subject: プロジェクトのファイルが削除されました
   text_email_doc_deleted: が次のプロジェクトのファイルを削除しました。
   label_links_only: リンクのみ
   
diff --git a/config/locales/pl.yml b/config/locales/pl.yml
index b19bed33..d9ef7d2c 100644
--- a/config/locales/pl.yml
+++ b/config/locales/pl.yml
@@ -267,12 +267,12 @@ pl:
   info_revision: "r%{rev}"
   link_workflow: Proces akceptacji
   notice_workflow_started: Proces akceptacji został uruchomiony 
-  text_email_subject_approved: "Proces akceptacji %{name} został zakończony akceptacją"
-  text_email_subject_rejected: "Proces akceptacji %{name} został odrzucony"
-  text_email_subject_delegated: "Proces akceptacji %{name} został delegowany"
-  text_email_subject_requires_approval: "Proces akceptacji %{name} wymaga Twojej akceptacji"
-  text_email_subject_updated: "Proces akceptacji %{name} został zaktualizowany"
-  text_email_subject_started: "Proces akceptacji %{name} został uruchomiony" 
+  text_email_subject_approved: został zakończony akceptacją
+  text_email_subject_rejected: został odrzucony
+  text_email_subject_delegated: został delegowany
+  text_email_subject_requires_approval: wymaga Twojej akceptacji
+  text_email_subject_updated: został zaktualizowany
+  text_email_subject_started: został uruchomiony
   text_email_finished_approved: "Proces akceptacji '%{name}' dokumentu '%{filename}' został właśnie zakończony. Dokument został zaakceptowany."
   text_email_finished_rejected: "Proces akceptacji '%{name}' dokumentu '%{filename}' został właśnie zakończony. Dokument został odrzucony z powodu '%{notice}'."
   text_email_finished_delegated: "Proces akceptacji '%{name}' dokumentu '%{filename}' został właśnie delegowany z powodu '%{notice}'. Zostałeś wskazany jako akceptujący w bieżącym kroku zatwierdzania."
@@ -301,10 +301,10 @@ pl:
   label_target_project: Projekt docelowy
   label_source_project: Projekt źródłowy  
   
-  text_email_doc_updated_subject: "Dokumenty projektu %{project} zostały zaktualizowane"
+  text_email_doc_updated_subject: Dokumenty zostały zaktualizowane
   text_email_doc_updated: dokumenty zostały zaktualizowane
   text_email_doc_follows: następujące
-  text_email_doc_deleted_subject: "Dokumenty projektu %{project} zostały usunięte"
+  text_email_doc_deleted_subject: Dokumenty zostały usunięte
   text_email_doc_deleted: dokumenty zostały usunięte
   label_links_only: odnośniki
   
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index c5739415..4f2b05ab 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -267,12 +267,12 @@ pt-BR:
   info_revision: "r%{rev}"
   link_workflow: Workflow
   notice_workflow_started: Workflow de aprovação foi iniciado com êxito
-  text_email_subject_approved: "Workflow de aprovação %{name}: aprovado"
-  text_email_subject_rejected: "Workflow de aprovação %{name} reprovado"
-  text_email_subject_delegated: "Workflow de aprovação %{name} atribuído para"
-  text_email_subject_requires_approval: "Workflow de aprovação %{name} requer sua aprovação"
-  text_email_subject_updated: "Workflow de aprovação %{name}: atualizado"
-  text_email_subject_started: "Workflow de aprovação %{name}: iniciado"
+  text_email_subject_approved: aprovado
+  text_email_subject_rejected: reprovado
+  text_email_subject_delegated: atribuído para
+  text_email_subject_requires_approval: requer sua aprovação
+  text_email_subject_updated: atualizado
+  text_email_subject_started: iniciado
   text_email_finished_approved: "O workflow de aprovação'%{name}' definido para o documento '%{filename}' foi finalizado e o documento foi aprovado."
   text_email_finished_rejected: "O workflow de aprovação '%{name}' definido para o documento '%{filename}' foi finalizado e o documento foi reprovado devido a '%{notice}'."
   text_email_finished_delegated: "O workflow de aprovação '%{name}' definido para o documento '%{filename}' foi atribuido pois '%{notice}' e está aguardando a sua aprovação na etapa atual."
@@ -301,10 +301,10 @@ pt-BR:
   label_target_project: Target project
   label_source_project: Source project
 
-  text_email_doc_updated_subject: "%{project} : Documentos atualizados"
+  text_email_doc_updated_subject: Documentos atualizados
   text_email_doc_updated: atualizou os documentos da área
   text_email_doc_follows: as follows
-  text_email_doc_deleted_subject: "%{project} : Exclusão de documentos"
+  text_email_doc_deleted_subject: Exclusão de documentos
   text_email_doc_deleted: deletou os documentos da área
   label_links_only: links only
 
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 97c238e7..8a17540e 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -267,12 +267,12 @@ ru:
   info_revision: "r%{rev}"
   link_workflow: Согласование  
   notice_workflow_started: Процесс согласования успешно запущен
-  text_email_subject_approved: "Процесс согласования %{name} успешно завершен"
-  text_email_subject_rejected: "Процесс согласования %{name} отклонен"
-  text_email_subject_delegated: "Процесс согласования %{name} делегирован"
-  text_email_subject_requires_approval: "Процесс согласования %{name} требует вашего участия"
-  text_email_subject_updated: "Процесс согласования %{name} обновлен"
-  text_email_subject_started: "Процесс согласования %{name} запущен" 
+  text_email_subject_approved: успешно завершен
+  text_email_subject_rejected: отклонен
+  text_email_subject_delegated: делегирован
+  text_email_subject_requires_approval: ребует вашего участия
+  text_email_subject_updated: обновлен
+  text_email_subject_started: запущен
   text_email_finished_approved: "Процесс согласования '%{name}' документа '%{filename}' только что завершился и документ был согласован."
   text_email_finished_rejected: "Процесс согласования '%{name}' документа '%{filename}' только что завершился и документ был отклонен по причине '%{notice}'."
   text_email_finished_delegated: "Процесс согласования '%{name}' документа '%{filename}' только что был делегирован по причине '%{notice}' и от Вас ожидается согласование."
@@ -301,10 +301,10 @@ ru:
   label_target_project: Целевой проект
   label_source_project: Исходный проект  
   
-  text_email_doc_updated_subject: "Документы проекта %{project} обновлены"
+  text_email_doc_updated_subject: Документы обновлены
   text_email_doc_updated: только что обновил документы
   text_email_doc_follows: следующим образом
-  text_email_doc_deleted_subject: "Документы проекта %{project} удалены"
+  text_email_doc_deleted_subject: Документы удалены
   text_email_doc_deleted: только что удалил документы
   label_links_only: только ссылки
   
diff --git a/config/locales/sl.yml b/config/locales/sl.yml
index 7b39b918..81ceb2e5 100644
--- a/config/locales/sl.yml
+++ b/config/locales/sl.yml
@@ -267,12 +267,12 @@ sl:
   info_revision: "r%{rev}"
   link_workflow: Workflow  
   notice_workflow_started: Approval workflow successfully started
-  text_email_subject_approved: "Approval workflow %{name} approved"
-  text_email_subject_rejected: "Approval workflow %{name} rejected"
-  text_email_subject_delegated: "Approval workflow %{name} delegated"
-  text_email_subject_requires_approval: "Approval workflow %{name} requires your approval"
-  text_email_subject_updated: "Approval workflow %{name} updated"
-  text_email_subject_started: "Approval workflow %{name} started" 
+  text_email_subject_approved: approved
+  text_email_subject_rejected: rejected
+  text_email_subject_delegated: delegated
+  text_email_subject_requires_approval: requires your approval
+  text_email_subject_updated: updated
+  text_email_subject_started: started
   text_email_finished_approved: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been approved."
   text_email_finished_rejected: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been rejected because of '%{notice}'."
   text_email_finished_delegated: "The approval workflow '%{name}' assigned to '%{filename}' document has just been delegated because of '%{notice}' and you are expected to do an approval in the current approval step."
@@ -301,10 +301,10 @@ sl:
   label_target_project: Target project
   label_source_project: Source project  
   
-  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated_subject: Documents 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_subject: Documents deleted
   text_email_doc_deleted: has just deleted documents of
   label_links_only: links only
   
diff --git a/config/locales/zh-TW.yml b/config/locales/zh-TW.yml
index 94f28e1c..052906f4 100644
--- a/config/locales/zh-TW.yml
+++ b/config/locales/zh-TW.yml
@@ -267,12 +267,12 @@ zh-TW:
   info_revision: "r%{rev}"
   link_workflow: Workflow  
   notice_workflow_started: Approval workflow successfully started
-  text_email_subject_approved: "Approval workflow %{name} approved"
-  text_email_subject_rejected: "Approval workflow %{name} rejected"
-  text_email_subject_delegated: "Approval workflow %{name} delegated"
-  text_email_subject_requires_approval: "Approval workflow %{name} requires your approval"
-  text_email_subject_updated: "Approval workflow %{name} updated"
-  text_email_subject_started: "Approval workflow %{name} started" 
+  text_email_subject_approved: approved
+  text_email_subject_rejected: rejected
+  text_email_subject_delegated: delegated
+  text_email_subject_requires_approval: requires your approval
+  text_email_subject_updated: updated
+  text_email_subject_started: started
   text_email_finished_approved: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been approved."
   text_email_finished_rejected: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been rejected because of '%{notice}'."
   text_email_finished_delegated: "The approval workflow '%{name}' assigned to '%{filename}' document has just been delegated because of '%{notice}' and you are expected to do an approval in the current approval step."
@@ -301,10 +301,10 @@ zh-TW:
   label_target_project: Target project
   label_source_project: Source project  
 
-  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated_subject: Documents 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_subject: Documents deleted
   text_email_doc_deleted: has just deleted documents of
   label_links_only: links only
 
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 2a299542..17a6a59a 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -267,12 +267,12 @@ zh:
   info_revision: "r%{rev}"
   link_workflow: Workflow  
   notice_workflow_started: Approval workflow successfully started
-  text_email_subject_approved: "Approval workflow %{name} approved"
-  text_email_subject_rejected: "Approval workflow %{name} rejected"
-  text_email_subject_delegated: "Approval workflow %{name} delegated"
-  text_email_subject_requires_approval: "Approval workflow %{name} requires your approval"
-  text_email_subject_updated: "Approval workflow %{name} updated"
-  text_email_subject_started: "Approval workflow %{name} started" 
+  text_email_subject_approved: approved
+  text_email_subject_rejected: rejected
+  text_email_subject_delegated: delegated
+  text_email_subject_requires_approval: requires your approval
+  text_email_subject_updated: updated
+  text_email_subject_started: started
   text_email_finished_approved: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been approved."
   text_email_finished_rejected: "The approval workflow '%{name}' assigned to '%{filename}' document has just been finished and the document has been rejected because of '%{notice}'."
   text_email_finished_delegated: "The approval workflow '%{name}' assigned to '%{filename}' document has just been delegated because of '%{notice}' and you are expected to do an approval in the current approval step."
@@ -301,10 +301,10 @@ zh:
   label_target_project: Target project
   label_source_project: Source project  
   
-  text_email_doc_updated_subject: "Documents of %{project} updated"
+  text_email_doc_updated_subject: Documents 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_subject: Documents deleted
   text_email_doc_deleted: has just deleted documents of
   label_links_only: links only