diff --git a/config/locales/cs.yml b/config/locales/cs.yml
index 5b37f2bd..6cf1960c 100644
--- a/config/locales/cs.yml
+++ b/config/locales/cs.yml
@@ -1,211 +1,244 @@
 # Czech translation for DMSF by vit.jonas@gmail.com, karel.picman@kontron.com
 cs:
-  :dmsf: "DMSF"
-  :label_dmsf_file_plural: "Dmsf soubory"
-  :warning_no_entries_selected: "Není nic vybráno"
-  :error_email_to_must_be_entered: "Musí být zadán adresát"
-  :notice_email_sent: "Email byl odeslán"
-  :warning_file_already_locked: "Soubor už je zamčen"
-  :notice_file_locked: "Soubor byl zamčen"
-  :warning_file_not_locked: "Soubor není zamčen"
-  :notice_file_unlocked: "Soubor byl odemčen"
-  :error_only_user_that_locked_file_can_unlock_it: "Soubor může být odemčen pouze uživatelem, který ho zamkl"
-  :question_do_you_really_want_to_delete_this_entry: "Chcete to skutečně smazat?"
-  :error_max_files_exceeded: "Limit pro %{number} najednou stažených souborů je překročen"
-  :question_do_you_really_want_to_delete_this_revision: "Chcete skutečně smazat tuto revizi?"
-  :error_entry_project_does_not_match_current_project: "Zadaný projekt neodpovídá aktuálnímu projektu"
-  :notice_folder_created: "Adresář byl vytvořen"
-  :error_folder_creation_failed: "Vytváření složky selhalo"
-  :error_folder_title_must_be_entered: "Musí být zadán název"
-  :notice_folder_deleted: "Adresář byl smazán"
-  :error_folder_is_not_empty: "Adresář není prázdný"
-  :error_folder_title_is_already_used: "Název již existuje"
-  :notice_folder_details_were_saved: "Detaily složky byly uloženy"
-  :error_file_is_locked: "Soubor je zamčen"
-  :notice_file_deleted: "Soubor byl smazán"
-  :error_at_least_one_revision_must_be_present: "Musí ezistovat alespoň jedna revize"
-  :notice_revision_deleted: "Revize byla smazána" 
-  :warning_one_of_files_locked: "Jeden ze souborů je zamčen"
-  :notice_file_unlocked: "Soubor bykl odemčen"
-  :notice_file_revision_created: " vytvořena nová revize"
-  :notice_your_preferences_were_saved: "Vaše nastavení bylo uloženo"
-  :warning_folder_notifications_already_activated: "Notifikace složky již byly aktivovány"
-  :notice_folder_notifications_activated: "Notifikace složky byly aktivovány"
-  :warning_folder_notifications_already_deactivated: "Notifikace složky již byly deaktivovány"
-  :notice_folder_notifications_deactivated: "Notifikace složky byly deaktivovány"
-  :warning_file_notifications_already_activated: "Notifikace souboru již byly aktivovány"
-  :notice_file_notifications_activated: "Notifikace souboru byly aktivovány"
-  :warning_file_notifications_already_deactivated: "Notifikace souboru již byly deaktivovány"
-  :notice_file_notifications_deactivated: "Notifikace souboru byly deaktivovány"
-  :link_details: "%{title} detaily"
-  :link_edit: "Upravit %{title}"
-  :submit_create: "Vytvořit"
-  :link_create_folder: "Vytvořit složku"
-  :title_check_uncheck_all_for_zip_download_or_email: "Vybrat/Nevybrat vše pro stažení jako Zip nebo emailem"
-  :link_title: "Název"
-  :link_size: "Velikost"
-  :link_modified: "Změněno"
-  :link_ver: "Ver."
-  :link_author: "Autor"
-  :title_check_for_zip_download_or_email: "Vybrat pro stažení jako Zip nebo emailem"
-  :title_delete: "Smazat"
-  :title_notifications_active_deactivate: "Notifikace aktivní: Deaktivovat"
-  :title_notifications_not_active_activate: "Notifikace nejsou aktivní: Aktivovat"
-  :title_title_version_version_download: "%{title} verze %{version} stáhnout"
-  :title_locked_by_user: "Zamčeno uživatelem %{user}"
-  :title_locked_by_you: "Zamčeno Vámi"
-  :title_waiting_for_approval: "Čeká na schválení"
-  :title_approved: "Schváleno"
-  :title_unlock_file: "Odemknout a uožnit změny ostatním uživatelům"
-  :title_lock_file: "Zamknout a zabránit změnám ostatních uživatelů"
-  :submit_download: "Stáhnout"
-  :title_download_checked: "Stáhnout vybrané jako Zip"
-  :submit_email: "Email"
-  :title_send_checked_by_email: "Zadeslat vybrané emailem"
-  :link_user_preferences: "Vaše nastavení"
-  :heading_send_documents_by_email: "Odeslat dokumenty emailem"
-  :label_email_from: "Od"
-  :label_email_to: "Komu"
-  :label_email_cc: "Kopie"
-  :label_email_subject: "Předmět"
-  :label_email_documents: "Documenty"
-  :label_email_body: "Obsah"
-  :label_email_send: "Odesláno"
-  :title_notifications_active: "Notifikace jsou aktivní"
-  :label_file_size: "Velikost souboru"
-  :heading_file_upload: "Nahrát"
-  :note_uploaded_maximum_files_at_once: "Maximálně může být nahráno %{number} souborů najednou."
-  :note_upload_files_greater_than_two_gb: "Nahrání souborů větších než 2GB vyžaduje 64b prohlížeč."
-  :submit_upload_files: "Nahrání"
-  :heading_new_folder: "Nová složka"
-  :label_title: "Název"
-  :label_description: "Popis"
-  :submit_save: "Uložit"
-  :info_file_locked: "Soubor je zamčen!"
-  :label_notifications: "Notifikace"
-  :select_option_default: "Výchozí"
-  :select_option_deactivated: "Deaktivováno"
-  :select_option_activated: "Aktivováno"
-  :title_save_preferences: "Uložit nastavení"
-  :heading_revisions: "Revize"
-  :title_download: "Stáhnout"
-  :title_delete_revision: "Smazat revizi"
-  :label_created: "Vytvořeno"
-  :label_changed: "Změněno"
-  :info_changed_by_user: "%{changed} uživatelem %{user}"
-  :label_filename: "Jméno souboru"
-  :label_version: "Verze"
-  :label_workflow: "Workflow"
-  :option_workflow_waiting_for_approval: "Čeká na schválení"
-  :option_workflow_approved: "Schváleno"
-  :option_workflow_none: "Žádné"
-  :label_mime: "Typ"
-  :label_size: "Velikost"
-  :label_comment: "Komentář"
-  :heading_new_revision: "Nová revize"
-  :option_version_same: "Stejná"
-  :option_version_minor: "Podružná"
-  :option_version_major: "Hlavní"
-  :label_new_content: "Nový obsah"
-  :label_maximum_files_upload: "Maximální počet najednou nahraných souborů"
-  :note_maximum_number_of_files_uploaded: "Maximální počet najednou nahraných souborů. 0 znamená bez omezení."
-  :label_maximum_files_download: "Maximální počet najednou stažených souborů"
-  :note_maximum_number_of_files_downloaded: "Maximální počet najednou stažených souborů jako Zip nebo odeslaných emailem. 0 znamená bez omezení."
-  :label_file_storage_directory: "Složka pro uložení souborů"
-  :label_index_database: "Index databáze"
-  :label_stemming_language: "Jazyk pro 'Stemming'"
-  :note_possible_values: "Povolené hodnoty"
-  :note_pass_none_to_disable_stemming: "zadej 'nic' pro vypnutí 'Stemming'"
-  :label_stem_strategy: "'Stem' strategie"
-  :option_stem_none: "Stem nic (výchozí)"
-  :option_stem_some: "Stem něco"
-  :option_stem_all: "Stem vše"
-  :label_stemming_description: "Tímto je určeno, jak analyzátor dotazu aplikuje algoritmus Stemmingu. Výchozí hodnota je STEM_NONE. Dostupné hodnoty jsou"
-  :note_do_not_stem: "Žádný stemming."
-  :note_stem_some: "Hledej stemmed formy výrazů kromě těch, které začínají velkým písmenem nebo jsou následovány určitými znaky nebo jsou použity s operátory, které vyžadují informaci o pozici. Stemmed výrazy začínají písmenem 'Z'."
-  :note_stem_all: "Hledej stemmed formy všech slov (poznámka: 'Z' prefix není přidán)."
-  :note_stemming_applied: "Poznámka, že algoritmus stemingu je aplikován pouze na slova v pravděpodobnostních polích - výrazy pravda/nepravda nejsou stemovány."
-  :label_default_notifications: "Výchozí notifikace souboru"
-  :heading_uploaded_files: "Nahrané soubory"
-  :submit_commit: "Potvrdit"
-  :link_documents: "Dokumenty"
-  :permission_view_dmsf_folders: "Procházet dokumenty"
-  :permission_user_preferences: "Nastavení uživatele"
-  :permission_view_dmsf_files: "Zobrazit dokumenty"
-  :permission_folder_manipulation: "Manipulace se složkami"
-  :permission_file_manipulation: "Manipulace se soubory"
-  :permission_file_approval: "Schválení souboru"
-  :permission_force_file_unlock: "Vynucené odemknutí souboru"
-  :label_file: "Soubor"
-  :field_folder: "Složka"
-  :error_create_cycle_in_folder_dependency: "vytvořit smyčku v závislostech složky"
-  :error_contains_invalid_character: "obsahuje neplatné znaky"
-  :error_file_commit_require_uploaded_file: "Potvrzení vyžaduje nahraný soubor"
-  :warning_some_files_were_not_commited: "Některé soubory nebyly potvrzené z důvodu chyb při validaci: %{files}"
-  :error_user_has_not_right_delete_folder: "Uživatel nemá právo mazat složky"
-  :error_user_has_not_right_delete_file: "Uživatel nemá právo mazat soubor"
-  :notice_entries_deleted: "Poožky smazány"
-  :warning_some_entries_were_not_deleted: "Některé položky nebyly smazány: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "Opravdu chcete smazat vybrané položky?"
-  :title_delete_checked: "Smaž vybrané"
-  :title_number_of_files_in_directory: "Počet souborů ve složce"
-  :title_filename_for_download: "Název Zip archívu ke stažení"
-  :label_number_of_folders: "Složky"
-  :label_number_of_documents: "Dokumenty"
-  :label_zip_names_encoding: "Kódováni názvu Zipu"
-  :note_zip_names_encoding_iconv: "Pro kódováni znaků z UTF8 do cílového kování je použi Iconv"
-  :error_file_storage_directory_does_not_exist: "Cílová složka neexistuje a nemůže být vytvořena"
-  :error_file_can_not_be_created: "Nelze vytvořit soubor v cílové složce"
-  :error_wrong_zip_encoding: "Chybné kódování Zipu"
-  :warning_xapian_not_available: "Xapian není k dostupný"
-  :menu_dmsf: "DMSF"
-  :label_physical_file_delete: "Fyzické smazání souboru"  
-  :user_is_not_project_member: "Nejste členem projektu"
-  :heading_access_downloads_emails: "Stažené/Emaily"
-  :heading_access_first: "První"
-  :heading_access_last: "Poslední"
-  :label_dmsf_updated: "DMSF změněno"
-  :title_total_size_of_all_files: "Celková velikost všech souborů v adresáři"
-  :project_module_dmsf: "DMSF"
-  :warning_no_project_to_copy_file_to: "Neexistuje projekt, do kterého můžete kopírovat"
-  :comment_copied_from: "Zkopírováno z %{source}"
-  :notice_file_copied: "Soubor zkopírován"
-  :notice_file_moved: "Soubor přesunut"
-  :label_target_project: "Cílový projekt"
-  :label_target_folder: "Cílový adresář"
-  :title_copy_or_move: "Kopírovat/Přesunout"
-  :label_dmsf_folder_plural: "Dmsf složky"
-  :comment_moved_from: "Přesunuto z %{source}"
-  :error_target_folder_same: "Cílový adresář a projekt jsou stejné jako aktuální"
-  :error_file_cannot_be_moved: "Soubor nemůže být přesunut"
-  :error_file_cannot_be_copied: "Soubor nemůže být zkopírován"
-  :warning_no_project_to_copy_folder_to: "Neexistuje projekt, do kterého můžete kopírovat"
-  :title_copy: "Kopírovat"
-  :error_folder_cannot_be_copied: "Složka nemůže být zkopírována"
-  :notice_folder_copied: "Složka zkopírována"
-  :error_max_email_filesize_exceeded: "Přesáhli jste maximální velikost souboru, který lze poslat emailem. (%{number} MB)"
+  dmsf: DMSF
+  label_dmsf_file_plural: Dmsf soubory
+  warning_no_entries_selected: Není nic vybráno
+  error_email_to_must_be_entered: Musí být zadán adresát
+  notice_email_sent: Email byl odeslán
+  warning_file_already_locked: Soubor už je zamčen
+  notice_file_locked: Soubor byl zamčen
+  warning_file_not_locked: Soubor není zamčen
+  notice_file_unlocked: Soubor byl odemčen
+  error_only_user_that_locked_file_can_unlock_it: Soubor může být odemčen pouze uživatelem, který ho zamkl
+  question_do_you_really_want_to_delete_this_entry: Chcete to skutečně smazat?
+  error_max_files_exceeded: "Limit pro %{number} najednou stažených souborů je překročen"
+  question_do_you_really_want_to_delete_this_revision: Chcete skutečně smazat tuto revizi?
+  error_entry_project_does_not_match_current_project: Zadaný projekt neodpovídá aktuálnímu projektu
+  notice_folder_created: Adresář byl vytvořen
+  error_folder_creation_failed: Vytváření složky selhalo
+  error_folder_title_must_be_entered: Musí být zadán název
+  notice_folder_deleted: Adresář byl smazán
+  error_folder_is_not_empty: Adresář není prázdný
+  error_folder_title_is_already_used: Název již existuje
+  notice_folder_details_were_saved: Detaily složky byly uloženy
+  error_file_is_locked: Soubor je zamčen
+  notice_file_deleted: Soubor byl smazán
+  error_at_least_one_revision_must_be_present: Musí existovat alespoň jedna revize
+  notice_revision_deleted: Revize byla smazána
+  warning_one_of_files_locked: Jeden ze souborů je zamčen
+  notice_file_unlocked: Soubor byl odemčen
+  notice_file_revision_created: vytvořena nová revize
+  notice_your_preferences_were_saved: Vaše nastavení bylo uloženo
+  warning_folder_notifications_already_activated: Notifikace složky již byly aktivovány
+  notice_folder_notifications_activated: Notifikace složky byly aktivovány
+  warning_folder_notifications_already_deactivated: Notifikace složky již byly deaktivovány
+  notice_folder_notifications_deactivated: Notifikace složky byly deaktivovány
+  warning_file_notifications_already_activated: Notifikace souboru již byly aktivovány
+  notice_file_notifications_activated: Notifikace souboru byly aktivovány
+  warning_file_notifications_already_deactivated: Notifikace souboru již byly deaktivovány
+  notice_file_notifications_deactivated: Notifikace souboru byly deaktivovány
+  link_details: "%{title} detaily"
+  link_edit: "Upravit %{title}"
+  submit_create: Vytvořit
+  link_create_folder: Vytvořit složku
+  title_check_uncheck_all_for_zip_download_or_email: Vybrat/Nevybrat vše pro stažení jako Zip nebo emailem
+  link_title: Název
+  link_size: Velikost
+  link_modified: Změněno
+  link_ver: Ver.
+  link_author: Autor
+  title_check_for_zip_download_or_email: Vybrat pro stažení jako Zip nebo emailem
+  title_delete: Smazat
+  title_notifications_active_deactivate: "Notifikace aktivní: Deaktivovat"
+  title_notifications_not_active_activate: "Notifikace nejsou aktivní: Aktivovat"
+  title_title_version_version_download: "%{title} verze %{version} stáhnout"
+  title_locked_by_user: "Zamčeno uživatelem %{user}"
+  title_locked_by_you: Zamčeno Vámi
+  title_waiting_for_approval: Čeká na schválení
+  title_approved: Schváleno
+  title_unlock_file: Odemknout a umožnit změny ostatním uživatelům
+  title_lock_file: Zamknout a zabránit změnám ostatních uživatelů
+  submit_download: Stáhnout
+  title_download_checked: Stáhnout vybrané jako Zip
+  submit_email: Email
+  title_send_checked_by_email: Zaslat vybrané emailem
+  link_user_preferences: Vaše nastavení
+  heading_send_documents_by_email: Odeslat dokumenty emailem
+  label_email_from: Od
+  label_email_to: Komu
+  label_email_cc: Kopie
+  label_email_subject: Předmět
+  label_email_documents: Documenty
+  label_email_body: Obsah
+  label_email_send: Odesláno
+  title_notifications_active: Notifikace jsou aktivní
+  label_file_size: Velikost souboru
+  heading_file_upload: Nahrát
+  note_uploaded_maximum_files_at_once: "Maximálně může být nahráno %{number} souborů najednou."
+  note_upload_files_greater_than_two_gb: Nahrání souborů větších než 2GB vyžaduje 64b prohlížeč.
+  submit_upload_files: Nahrání
+  heading_new_folder: Nová složka
+  label_title: Název
+  label_description: Popis
+  submit_save: Uložit
+  info_file_locked: Soubor je zamčen!
+  label_notifications: Notifikace
+  select_option_default: Výchozí
+  select_option_deactivated: Deaktivováno
+  select_option_activated: Aktivováno
+  title_save_preferences: Uložit nastavení
+  heading_revisions: Revize
+  title_download: Stáhnout
+  title_delete_revision: Smazat revizi
+  label_created: Vytvořeno
+  label_changed: Změněno
+  info_changed_by_user: "%{changed} uživatelem %{user}"
+  label_filename: Jméno souboru
+  label_version: Verze
+  label_workflow: Workflow
+  label_mime: Typ
+  label_size: Velikost
+  label_comment: Komentář
+  heading_new_revision: Nová revize
+  option_version_same: Stejná
+  option_version_minor: Podružná
+  option_version_major: Hlavní
+  label_new_content: Nový obsah
+  label_maximum_files_upload: Maximální počet najednou nahraných souborů
+  note_maximum_number_of_files_uploaded: Maximální počet najednou nahraných souborů. 0 znamená bez omezení.
+  label_maximum_files_download: Maximální počet najednou stažených souborů
+  note_maximum_number_of_files_downloaded: Maximální počet najednou stažených souborů jako Zip nebo odeslaných emailem. 0 znamená bez omezení.
+  label_file_storage_directory: Složka pro uložení souborů
+  label_index_database: Index databáze
+  label_stemming_language: "Jazyk pro 'Stemming'"
+  note_possible_values: Povolené hodnoty
+  note_pass_none_to_disable_stemming: "zadej 'nic' pro vypnutí 'Stemming'"
+  label_stem_strategy: "'Stem' strategie"
+  option_stem_none: Stem nic (výchozí)
+  option_stem_some: Stem něco
+  option_stem_all: Stem vše
+  label_stemming_description: Tímto je určeno, jak analyzátor dotazu aplikuje algoritmus Stemmingu. Výchozí hodnota je STEM_NONE. Dostupné hodnoty jsou  
+  note_do_not_stem: Žádný stemming.
+  note_stem_some: "Hledej stemmed formy výrazů kromě těch, které začínají velkým písmenem nebo jsou následovány určitými znaky nebo jsou použity s operátory, které vyžadují informaci o pozici. Stemmed výrazy začínají písmenem 'Z'."
+  note_stem_all: "Hledej stemmed formy všech slov (poznámka: 'Z' prefix není přidán)."
+  note_stemming_applied: Poznámka, že algoritmus stemingu je aplikován pouze na slova v pravděpodobnostních polích - výrazy pravda/nepravda nejsou stemovány.
+  label_default_notifications: Výchozí notifikace souboru
+  heading_uploaded_files: Nahrané soubory
+  submit_commit: Potvrdit
+  link_documents: Dokumenty
+  permission_view_dmsf_folders: Procházet dokumenty
+  permission_user_preferences: Nastavení uživatele
+  permission_view_dmsf_files: Zobrazit dokumenty
+  permission_folder_manipulation: Manipulace se složkami
+  permission_file_manipulation: Manipulace se soubory
+  permission_file_approval: Schválení souboru
+  permission_force_file_unlock: Vynucené odemknutí souboru
+  label_file: Soubor
+  field_folder: Složka
+  error_create_cycle_in_folder_dependency: vytvořit smyčku v závislostech složky
+  error_contains_invalid_character: obsahuje neplatné znaky
+  error_file_commit_require_uploaded_file: Potvrzení vyžaduje nahraný soubor
+  warning_some_files_were_not_commited: "Některé soubory nebyly potvrzené z důvodu chyb při validaci: %{files}"
+  error_user_has_not_right_delete_folder: Uživatel nemá právo mazat složky
+  error_user_has_not_right_delete_file: Uživatel nemá právo mazat soubor
+  notice_entries_deleted: Položky smazány
+  warning_some_entries_were_not_deleted: "Některé položky nebyly smazány: %{entries}"
+  question_do_you_really_want_to_delete_entries: Opravdu chcete smazat vybrané položky?
+  title_delete_checked: Smaž vybrané
+  title_number_of_files_in_directory: Počet souborů ve složce
+  title_filename_for_download: Název Zip archívu ke stažení
+  label_number_of_folders: Složky
+  label_number_of_documents: Dokumenty
+  label_zip_names_encoding: Kódováni názvu Zipu
+  note_zip_names_encoding_iconv: Pro kódováni znaků z UTF8 do cílového kování je použi Iconv
+  error_file_storage_directory_does_not_exist: Cílová složka neexistuje a nemůže být vytvořena
+  error_file_can_not_be_created: Nelze vytvořit soubor v cílové složce
+  error_wrong_zip_encoding: Chybné kódování Zipu
+  warning_xapian_not_available: Xapian není k dostupný
+  menu_dmsf: DMSF
+  label_physical_file_delete: Fyzické smazání souboru
+  user_is_not_project_member: Nejste členem projektu
+  heading_access_downloads_emails: Stažené/Emaily
+  heading_access_first: První
+  heading_access_last: Poslední
+  label_dmsf_updated: DMSF změněno
+  title_total_size_of_all_files: Celková velikost všech souborů v adresáři
+  project_module_dmsf: DMSF
+  warning_no_project_to_copy_file_to: Neexistuje projekt, do kterého můžete kopírovat
+  comment_copied_from: "Zkopírováno z %{source}"
+  notice_file_copied: Soubor zkopírován
+  notice_file_moved: Soubor přesunut
+  label_target_project: Cílový projekt
+  label_target_folder: Cílový adresář
+  title_copy_or_move: Kopírovat/Přesunout
+  label_dmsf_folder_plural: Dmsf složky
+  comment_moved_from: "Přesunuto z %{source}"
+  error_target_folder_same: Cílový adresář a projekt jsou stejné jako aktuální
+  error_file_cannot_be_moved: Soubor nemůže být přesunut
+  error_file_cannot_be_copied: Soubor nemůže být zkopírován
+  warning_no_project_to_copy_folder_to: Neexistuje projekt, do kterého můžete kopírovat
+  title_copy: Kopírovat
+  error_folder_cannot_be_copied: Složka nemůže být zkopírována
+  notice_folder_copied: Složka zkopírována
+  error_max_email_filesize_exceeded: "Přesáhli jste maximální velikost souboru, který lze poslat emailem. (%{number} MB)"
   
-  :note_maximum_email_filesize: "Omezí se maximální velikost souboru, který může být poslán emailem. 0 znamená neomezený. Číslo je v MB."
-  :label_maximum_email_filesize: "Maximální velikost souboru emailu"
-  :header_minimum_filesize: "Chyba souboru."
-  :error_minimum_filesize: "Soubor %{file} má nulovou velikost a nebude přiložen."
-  :parent_directory: "Nadřazený adresář"
-  :note_webdav: "Webdav je po založení k dispozici na http://.../dmsf/webdav/"
-  :label_webdav: "Webdav functionalita"
-  :label_dmsf_plural: "Kopíruj DMSF soubory a složky (%{files} souborů v %{folders} složkách)"
+  note_maximum_email_filesize: Omezí se maximální velikost souboru, který může být poslán emailem. 0 znamená neomezený. Číslo je v MB.
+  label_maximum_email_filesize: Maximální velikost souboru emailu
+  header_minimum_filesize: Chyba souboru.
+  error_minimum_filesize: "Soubor %{file} má nulovou velikost a nebude přiložen."
+  parent_directory: Nadřazený adresář
+  note_webdav: "Webdav je po založení k dispozici na http://.../dmsf/webdav/"
+  label_webdav: Webdav functionalita
+  label_dmsf_plural: "Kopíruj DMSF soubory a složky (%{files} souborů v %{folders} složkách)"
 
-  :warning_folder_already_locked: "Tato složka je již zamčená"
-  :notice_folder_locked: "Složka byla úspěšně zamčena"
-  :warning_folder_not_locked: "Složku nelze zamknout"
-  :notice_folder_unlocked: "Složka byla odemčena"
-  :error_only_user_that_locked_folder_can_unlock_it: "Nemáte oprávnění k odemknutí této složky"
-  :title_folder_parent_locked: "Nadřazená složka %{name} je zamčená"
-  :title_file_parent_locked: "Nadřazená složka %{name} je zamčená"
-  :title_unlock_folder: "Odemknout"
-  :title_lock_folder: "Zamknout"
+  warning_folder_already_locked: Tato složka je již zamčená
+  notice_folder_locked: Složka byla úspěšně zamčena
+  warning_folder_not_locked: Složku nelze zamknout
+  notice_folder_unlocked: Složka byla odemčena
+  error_only_user_that_locked_folder_can_unlock_it: Nemáte oprávnění k odemknutí této složky
+  title_folder_parent_locked: "Nadřazená složka %{name} je zamčená"
+  title_file_parent_locked: "Nadřazená složka %{name} je zamčená"
+  title_unlock_folder: Odemknout
+  title_lock_folder: Zamknout
 
-  :select_option_webdav_readonly: "Pouze pro čtení"
-  :select_option_webdav_readwrite: "Čtení/Zápis"
-  :label_webdav_strategy: "Webdav strategie"
-  :note_webdav_strategy: "Umožní administrátorovi rozhodnout, zdali je webdav pouze pro čtení nebo i pro zápis."
-  
\ No newline at end of file
+  select_option_webdav_readonly: Pouze pro čtení
+  select_option_webdav_readwrite: Čtení/Zápis
+  label_webdav_strategy: Webdav strategie
+  note_webdav_strategy: Umožní administrátorovi rozhodnout, zdali je webdav pouze pro čtení nebo i pro zápis.
+    
+  error_unable_delete_dmsf_workflow: Nelze smazat schvalovací proces
+  error_empty_note: Musí být vyplněn komentář
+  error_workflow_assign: Chyba při přiřazování
+  error_cannot_start_workflow: Schvalovací proces nemůže být zahájen
+  error_cannot_renumber_steps: Schvalovací kroky nelze přečíslovat
+  label_dmsf_workflow_new: Nový schvalovací proces
+  label_dmsf_workflow: Schvalovací proces
+  label_dmsf_workflow_plural: Schvalovací procesy
+  label_dmsf_workflow_step: Krok
+  label_dmsf_workflow_step_plural: Kroky
+  label_dmsf_workflow_approval: Schválení
+  label_dmsf_workflow_approval_plural: Schválení
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Schválit
+  label_dmsf_wokflow_action_reject: Odmítnout
+  label_dmsf_wokflow_action_delegate: Delegovat na
+  label_dmsf_wokflow_action_assign: Přiřadit schvalovací proces
+  label_dmsf_wokflow_action_start: Zahájit schvalovací proces
+  label_action: Akce
+  label_note: Komentář
+  title_none: Komentář
+  title_rejection: Zamítnutí
+  title_delegation: Delegace
+  title_assignment: Přiřazení
+  title_start: Zahájení
+  title_dmsf_workflow_log: Historie schvalovacího procesu
+  title_assigned: Přiřazený
+  title_approval: Schválený
+  title_rejected: Zamítnutý
+  dmsf_and: A
+  dmsf_or: NEBO
+  dmsf_new_step: Nový krok
+  message_dmsf_wokflow_note: Váš komentář...
+  info_revision: "r%{rev}"
+  link_workflow: Schvalovací proces
+  notice_workflow_started: Schvalovací proces byl úspěšně zahájen
\ No newline at end of file
diff --git a/config/locales/de.yml b/config/locales/de.yml
index c8ed33ac..c2def23c 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -1,211 +1,244 @@
 # German translation for DMSF by Terrence Miller
 de:
-  :dmsf: "DMS"
-  :label_dmsf_file_plural: "DMS"
-  :warning_no_entries_selected: "Keine Einträge ausgewählt"
-  :error_email_to_must_be_entered: "Es muss ein Email-Empfänger angegeben werden."
-  :notice_email_sent: "Email gesendet"
-  :warning_file_already_locked: "Datei schon gesperrt"
-  :notice_file_locked: "Datei gesperrt"
-  :warning_file_not_locked: "Datei nicht gesperrt"
-  :notice_file_unlocked: "Dateisperre gelöst"
-  :error_only_user_that_locked_file_can_unlock_it: "Nur der Benutzer, der die Datei gesperrt hat, kann sie auch wieder freigeben"
-  :question_do_you_really_want_to_delete_this_entry: "Willst du diesen Eintrag wirklich löschen?"
-  :error_max_files_exceeded: "Grenze für %{number} gleichzeitig heruntergeladene Dateien überschritten"
-  :question_do_you_really_want_to_delete_this_revision: "Möchtest du diese Dateiversion wirklich löschen?"
-  :error_entry_project_does_not_match_current_project: "Entry Projekt entspricht nicht aktuellen Projekt"
-  :notice_folder_created: "Ordner erstellt"
-  :error_folder_creation_failed: "Ordnererstellung fehlgeschlagen"
-  :error_folder_title_must_be_entered: "Es muss ein Titel angegeben werden"
-  :notice_folder_deleted: "Ordner gelöscht"
-  :error_folder_is_not_empty: "Ordner ist nicht leer"
-  :error_folder_title_is_already_used: "Titel wird schon benutzt. Denk dir was Neues aus."
-  :notice_folder_details_were_saved: "Ordnerdetails wurden gespeichert"
-  :error_file_is_locked: "Datei ist gesperrt"
-  :notice_file_deleted: "Datei gelöscht"
-  :error_at_least_one_revision_must_be_present: "Es muss mindestens eine Version existieren"
-  :notice_revision_deleted: "Version gelöscht"
-  :warning_one_of_files_locked: "Eine der Dateien ist gesperrt"
-  :notice_file_unlocked: "Dateisperre gelöst"
-  :notice_file_revision_created: "Dateiversion erstellt"
-  :notice_your_preferences_were_saved: "Deine Einstellungen wurden gespeichert"
-  :warning_folder_notifications_already_activated: "Ordnerbenachrichtigungen schon aktiviert"
-  :notice_folder_notifications_activated: "Ordnerbenachrichtigungen aktiviert"
-  :warning_folder_notifications_already_deactivated: "Ordnerbenachrichtigungen schon deaktiviert"
-  :notice_folder_notifications_deactivated: "Ordnerbenachrichtigungen deaktiviert"
-  :warning_file_notifications_already_activated: "Dateibenachrichtigungen schon aktiviert"
-  :notice_file_notifications_activated: "Dateibenachrichtigungen aktiviert"
-  :warning_file_notifications_already_deactivated: "Dateibenachrichtigungen schon deaktiviert"
-  :notice_file_notifications_deactivated: "Dateibenachrichtigungen deaktiviert"
-  :link_details: "%{title} Details"
-  :link_edit: "Bearbeite %{title}"
-  :submit_create: "Erstellen"
-  :link_create_folder: "Erzeuge Ordner"
-  :title_check_uncheck_all_for_zip_download_or_email: "Wähle alle/keine für ZIP-Download bzw. Email"
-  :link_title: "Titel"
-  :link_size: "Größe"
-  :link_modified: "Geändert"
-  :link_ver: "Version"
-  :link_author: "Autor"
-  :title_check_for_zip_download_or_email: "Wähle für ZIP-Download bzw. Email"
-  :title_delete: "Löschen"
-  :title_notifications_active_deactivate: "Benachrichtigungen aktiv: Ausschalten"
-  :title_notifications_not_active_activate: "Benachrichtigungen nicht aktiv: Einschalten"
-  :title_title_version_version_download: "%{title} Version %{version} Download"
-  :title_locked_by_user: "Gesperrt von %{user}"
-  :title_locked_by_you: "Gesperrt von dir"
-  :title_waiting_for_approval: "Warte auf Zustimmung"
-  :title_approved: "Zugestimmt"
-  :title_unlock_file: "Hebe Sperre auf um Änderungen anderer Nutzer zu ermöglichen"
-  :title_lock_file: "Sperre um Änderungen anderer Nutzer zu verhindern"
-  :submit_download: "Download"
-  :title_download_checked: "Download der ausgewählten Dateien in einem ZIP-Archiv"
-  :submit_email: "Email"
-  :title_send_checked_by_email: "Sende gewählte Dateien per Email"
-  :link_user_preferences: "Deine Einstellungen"
-  :heading_send_documents_by_email: "Sende Dateien per Email"  
-  :label_email_from: "Von"
-  :label_email_to: "An"
-  :label_email_cc: "CC"
-  :label_email_subject: "Betreff"
-  :label_email_documents: "Dateien"
-  :label_email_body: "Text"
-  :label_email_send: "Senden"
-  :title_notifications_active: "Benachrichtigungen aktiv"
-  :label_file_size: "Dateigröße"
-  :heading_file_upload: "Upload"
-  :note_uploaded_maximum_files_at_once: "Es können maximal %{number} Dateien auf einmal hochgeladen werden."
-  :note_upload_files_greater_than_two_gb: "Um Dateien größer 2GB hochzuladen brauchst du einen 64bit-Browser."
-  :submit_upload_files: "Upload"
-  :heading_new_folder: "Neuer Ordner"  
-  :label_title: "Titel"
-  :label_description: "Beschreibung"
-  :submit_save: "Speichern"
-  :info_file_locked: "Datei gesperrt!"
-  :label_notifications: "Benachrichtigungen"
-  :select_option_default: "Voreinstellung"
-  :select_option_deactivated: "Aus"
-  :select_option_activated: "Ein"
-  :title_save_preferences: "Speichere Einstellungen"
-  :heading_revisions: "Versionen"
-  :title_download: "Download"
-  :title_delete_revision: "Lösche Version"
-  :label_created: "Erstellt"
-  :label_changed: "Geändert"
-  :info_changed_by_user: "%{changed} von %{user}"
-  :label_filename: "Dateiname"
-  :label_version: "Version"
-  :label_workflow: "Workflow"
-  :option_workflow_waiting_for_approval: "Warte auf Zustimmung"
-  :option_workflow_approved: "Zugestimmt"
-  :option_workflow_none: "Keiner"
-  :label_mime: "Mime"
-  :label_size: "Größe"
-  :label_comment: "Kommentar"
-  :heading_new_revision: "Neue Version"
-  :option_version_same: "gleiche Version"
-  :option_version_minor: "Unterversion"
-  :option_version_major: "Hauptversion"
-  :label_new_content: "Neuer Inhalt"
-  :label_maximum_files_upload: "Maximal hochzuladende Dateien"
-  :note_maximum_number_of_files_uploaded: "Beschränkt die Anzahl der maximal auf einmal hochladbaren Dateien. 0 bedeutet unbeschränkt."
-  :label_maximum_files_download: "Maximal herunterzuladende Dateien"
-  :note_maximum_number_of_files_downloaded: "Beschränkt die Anzahl der maximal auf einmal herunterladbaren Dateien (per ZIP oder Mail). 0 bedeutet unbeschränkt."
-  :label_file_storage_directory: "Verzeichnis für die Dateiablage"
-  :label_index_database: "Index Datenbank"
-  :label_stemming_language: "Sprache für die Normalformreduktion"
-  :note_possible_values: "Mögliche Werte"
-  :note_pass_none_to_disable_stemming: "übergebe 'none' um die Normalformreduktion zu unterdrücken"
-  :label_stem_strategy: "Normalformreduktionsform"
-  :option_stem_none: "reduziere nichts (Voreinstellung)"
-  :option_stem_some: "reduziere manches"
-  :option_stem_all: "reduziere alles"
-  :label_stemming_description: "Diese Einstellung beeinflusst wie der Parser den Normalformreduktionsalgorithmus anwendet. Voreingestellt ist STEM_NONE. Die möglichen Werte sind"
-  :note_do_not_stem: "Mache keine Normalformreduktion."
-  :note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'."
-  :note_stem_all: "Suche nach reduzierten Formen aller Wörter (Achtung: Kein 'Z'-Präfix wird hinzugefügt)."
-  :note_stemming_applied: "Beachte, dass der Normalformreduzierungsalgorithmus nur bei Wörtern in Wahrscheinlichkeitsfeldern angewendert wird - boolesche Filterausdrücke werden nie reduziert."
-  :label_default_notifications: "standardmäßge Dateibenachrichtigungen"
-  :heading_uploaded_files: "Hochgeladene Dateien"
-  :submit_commit: "OK"
-  :link_documents: "Dateien"
-  :permission_view_dmsf_folders: "Durchforste Dateien"
-  :permission_user_preferences: "Benutzereinstellungen"
-  :permission_view_dmsf_files: "Betrachte Dateien"
-  :permission_folder_manipulation: "Ordner manipulation"
-  :permission_file_manipulation: "Datei manipulation"
-  :permission_file_approval: "Datei approval"
-  :permission_force_file_unlock: "Erzwinge Aufhebung der Dateisperre"
-  :label_file: "Datei"
-  :field_folder: "Ordner"
-  :error_create_cycle_in_folder_dependency: "schaffen Zyklus in Abhängigkeit Ordner"
-  :error_contains_invalid_character: "enthält ungültige Zeichen"
-  :error_file_commit_require_uploaded_file: "Begehen einen Datei erfordet hochladene Datei"
-  :warning_some_files_were_not_commited: "Einige Dateien wurden nich begehen wegen Validation Fehlern: %{files}"
-  :error_user_has_not_right_delete_folder: "Der Nutzer hat kein Recht die Ordner zu löschen."
-  :error_user_has_not_right_delete_file: "Der Nutzer hat kein Recht die Datei zu löschen."
-  :notice_entries_deleted: "Aufnahmen löschen"
-  :warning_some_entries_were_not_deleted: "Enige Aufnahmen wurden nich gelöscht: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "Willst du wirklich die gewählten Aufnahmen löschen?"
-  :title_delete_checked: "Lösch gewähltest"
-  :title_number_of_files_in_directory: "Dateizahl in dem Ordner"
-  :title_filename_for_download: "Dateiname benutzt zum Herunterladen oder ZIP-archivierung"
-  :label_number_of_folders: "Order"
-  :label_number_of_documents: "Dokumente"
-  :label_zip_names_encoding: "ZIP-namen Kodierung"
-  :note_zip_names_encoding_iconv: "Iconv ist benutzt zum Charset-konversion von utf-8 in Zielkodierung"
-  :error_file_storage_directory_does_not_exist: "Ordner zum Dateispeichern existiert nicht und kann nicht gebildet."
-  :error_file_can_not_be_created: "Datei kann nicht in dem gewählten Ordner gebildet werden."
-  :error_wrong_zip_encoding: "Falsche ZIP-kodierung"
-  :warning_xapian_not_available: "Xapian nicht zur Verfügung"
-  :menu_dmsf: "DMS"
-  :label_physical_file_delete: "Physisches Dateilöschen"
-  :user_is_not_project_member: "Du bist kein Projektmitglied"
-  :heading_access_downloads_emails: "Herunterladene/Emails"
-  :heading_access_first: "Erste"
-  :heading_access_last: "Letzte"
-  :label_dmsf_updated: "DMS aktualisiert"
-  :title_total_size_of_all_files: "Gesamtgröße aller Datein in diesem Ordner"
-  :project_module_dmsf: "DMS"
-  :warning_no_project_to_copy_file_to: "Kein Projekt für das Dateikopieren."
-  :comment_copied_from: "Kopiert aus %{source}"
-  :notice_file_copied: "Datei kopiert"
-  :notice_file_moved: "Datei verschoben"
-  :label_target_project: "Zielprojekte"
-  :label_target_folder: "Zielordner"
-  :title_copy_or_move: "Kopieren/Verschieben"
-  :label_dmsf_folder_plural: "Ordner"
-  :comment_moved_from: "Verschoben aus %{source}"
-  :error_target_folder_same: "Zielordner und Projekt sind dieselbe wie die Aktuelle."
-  :error_file_cannot_be_moved: "Die Datei kann nicht verschoben werden."
-  :error_file_cannot_be_copied: "Die Datei kann nicht kopiert werden."
-  :warning_no_project_to_copy_folder_to: "Kein Projekt für das Ordnerkopieren."
-  :title_copy: "Kopieren"
-  :error_folder_cannot_be_copied: "Der Ordner kann nicht kopiert werden."
-  :notice_folder_copied: "Ordner kopiert"
+  dmsf: DMS
+  label_dmsf_file_plural: DMS
+  warning_no_entries_selected: Keine Einträge ausgewählt
+  error_email_to_must_be_entered: Es muss ein Email-Empfänger angegeben werden.
+  notice_email_sent: Email gesendet
+  warning_file_already_locked: Datei schon gesperrt
+  notice_file_locked: Datei gesperrt
+  warning_file_not_locked: Datei nicht gesperrt
+  notice_file_unlocked: Dateisperre gelöst
+  error_only_user_that_locked_file_can_unlock_it: Nur der Benutzer, der die Datei gesperrt hat, kann sie auch wieder freigeben
+  question_do_you_really_want_to_delete_this_entry: Willst du diesen Eintrag wirklich löschen?
+  error_max_files_exceeded: "Grenze für %{number} gleichzeitig heruntergeladene Dateien überschritten"
+  question_do_you_really_want_to_delete_this_revision: Möchtest du diese Dateiversion wirklich löschen?
+  error_entry_project_does_not_match_current_project: Entry Projekt entspricht nicht aktuellen Projekt
+  notice_folder_created: Ordner erstellt
+  error_folder_creation_failed: Ordnererstellung fehlgeschlagen
+  error_folder_title_must_be_entered: Es muss ein Titel angegeben werden
+  notice_folder_deleted: Ordner gelöscht
+  error_folder_is_not_empty: Ordner ist nicht leer
+  error_folder_title_is_already_used: Titel wird schon benutzt. Denk dir was Neues aus.
+  notice_folder_details_were_saved: Ordnerdetails wurden gespeichert
+  error_file_is_locked: Datei ist gesperrt
+  notice_file_deleted: Datei gelöscht
+  error_at_least_one_revision_must_be_present: Es muss mindestens eine Version existieren
+  notice_revision_deleted: Version gelöscht
+  warning_one_of_files_locked: Eine der Dateien ist gesperrt
+  notice_file_unlocked: Dateisperre gelöst
+  notice_file_revision_created: Dateiversion erstellt
+  notice_your_preferences_were_saved: Deine Einstellungen wurden gespeichert
+  warning_folder_notifications_already_activated: Ordnerbenachrichtigungen schon aktiviert
+  notice_folder_notifications_activated: Ordnerbenachrichtigungen aktiviert
+  warning_folder_notifications_already_deactivated: Ordnerbenachrichtigungen schon deaktiviert
+  notice_folder_notifications_deactivated: Ordnerbenachrichtigungen deaktiviert
+  warning_file_notifications_already_activated: Dateibenachrichtigungen schon aktiviert
+  notice_file_notifications_activated: Dateibenachrichtigungen aktiviert
+  warning_file_notifications_already_deactivated: Dateibenachrichtigungen schon deaktiviert
+  notice_file_notifications_deactivated: Dateibenachrichtigungen deaktiviert
+  link_details: "%{title} Details"
+  link_edit: "Bearbeite %{title}"
+  submit_create: Erstellen
+  link_create_folder: Erzeuge Ordner
+  title_check_uncheck_all_for_zip_download_or_email: Wähle alle/keine für ZIP-Download bzw. Email
+  link_title: Titel
+  link_size: Größe
+  link_modified: Geändert
+  link_ver: Version
+  link_author: Autor
+  title_check_for_zip_download_or_email: Wähle für ZIP-Download bzw. Email
+  title_delete: Löschen
+  title_notifications_active_deactivate: "Benachrichtigungen aktiv: Ausschalten"
+  title_notifications_not_active_activate: "Benachrichtigungen nicht aktiv: Einschalten"
+  title_title_version_version_download: "%{title} Version %{version} Download"
+  title_locked_by_user: "Gesperrt von %{user}"
+  title_locked_by_you: Gesperrt von dir
+  title_waiting_for_approval: Warte auf Zustimmung
+  title_approved: Zugestimmt
+  title_unlock_file: Hebe Sperre auf um Änderungen anderer Nutzer zu ermöglichen
+  title_lock_file: Sperre um Änderungen anderer Nutzer zu verhindern
+  submit_download: Download
+  title_download_checked: Download der ausgewählten Dateien in einem ZIP-Archiv
+  submit_email: Email
+  title_send_checked_by_email: Sende gewählte Dateien per Email
+  link_user_preferences: Deine Einstellungen
+  heading_send_documents_by_email: Sende Dateien per Email
+  label_email_from: Von
+  label_email_to: An
+  label_email_cc: CC
+  label_email_subject: Betreff
+  label_email_documents: Dateien
+  label_email_body: Text
+  label_email_send: Senden
+  title_notifications_active: Benachrichtigungen aktiv
+  label_file_size: Dateigröße
+  heading_file_upload: Upload
+  note_uploaded_maximum_files_at_once: "Es können maximal %{number} Dateien auf einmal hochgeladen werden."
+  note_upload_files_greater_than_two_gb: Um Dateien größer 2GB hochzuladen brauchst du einen 64bit-Browser.
+  submit_upload_files: Upload
+  heading_new_folder: Neuer Ordner
+  label_title: Titel
+  label_description: Beschreibung
+  submit_save: Speichern
+  info_file_locked: Datei gesperrt!
+  label_notifications: Benachrichtigungen
+  select_option_default: Voreinstellung
+  select_option_deactivated: Aus
+  select_option_activated: Ein
+  title_save_preferences: Speichere Einstellungen
+  heading_revisions: Versionen
+  title_download: Download
+  title_delete_revision: Lösche Version
+  label_created: Erstellt
+  label_changed: Geändert
+  info_changed_by_user: "%{changed} von %{user}"
+  label_filename: Dateiname
+  label_version: Version
+  label_workflow: Workflow
+  label_mime: Mime
+  label_size: Größe
+  label_comment: Kommentar
+  heading_new_revision: Neue Version
+  option_version_same: gleiche Version
+  option_version_minor: Unterversion
+  option_version_major: Hauptversion
+  label_new_content: Neuer Inhalt
+  label_maximum_files_upload: Maximal hochzuladende Dateien
+  note_maximum_number_of_files_uploaded: Beschränkt die Anzahl der maximal auf einmal hochladbaren Dateien. 0 bedeutet unbeschränkt.
+  label_maximum_files_download: Maximal herunterzuladende Dateien
+  note_maximum_number_of_files_downloaded: Beschränkt die Anzahl der maximal auf einmal herunterladbaren Dateien (per ZIP oder Mail). 0 bedeutet unbeschränkt.
+  label_file_storage_directory: Verzeichnis für die Dateiablage
+  label_index_database: Index Datenbank
+  label_stemming_language: Sprache für die Normalformreduktion
+  note_possible_values: Mögliche Werte
+  note_pass_none_to_disable_stemming: "übergebe 'none' um die Normalformreduktion zu unterdrücken"
+  label_stem_strategy: Normalformreduktionsform
+  option_stem_none: reduziere nichts (Voreinstellung)
+  option_stem_some: reduziere manches
+  option_stem_all: reduziere alles
+  label_stemming_description: Diese Einstellung beeinflusst wie der Parser den Normalformreduktionsalgorithmus anwendet. Voreingestellt ist STEM_NONE. Die möglichen Werte sind
+  note_do_not_stem: Mache keine Normalformreduktion.
+  note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'."
+  note_stem_all: "Suche nach reduzierten Formen aller Wörter (Achtung: Kein 'Z'-Präfix wird hinzugefügt)."
+  note_stemming_applied: Beachte, dass der Normalformreduzierungsalgorithmus nur bei Wörtern in Wahrscheinlichkeitsfeldern angewendert wird - boolesche Filterausdrücke werden nie reduziert.
+  label_default_notifications: standardmäßge Dateibenachrichtigungen
+  heading_uploaded_files: Hochgeladene Dateien
+  submit_commit: OK
+  link_documents: Dateien
+  permission_view_dmsf_folders: Durchforste Dateien
+  permission_user_preferences: Benutzereinstellungen
+  permission_view_dmsf_files: Betrachte Dateien
+  permission_folder_manipulation: Ordner manipulation
+  permission_file_manipulation: Datei manipulation
+  permission_file_approval: Datei approval
+  permission_force_file_unlock: Erzwinge Aufhebung der Dateisperre
+  label_file: Datei
+  field_folder: Ordner
+  error_create_cycle_in_folder_dependency: schaffen Zyklus in Abhängigkeit Ordner
+  error_contains_invalid_character: enthält ungültige Zeichen
+  error_file_commit_require_uploaded_file: Begehen einen Datei erfordet hochladene Datei
+  warning_some_files_were_not_commited: "Einige Dateien wurden nich begehen wegen Validation Fehlern: %{files}"
+  error_user_has_not_right_delete_folder: Der Nutzer hat kein Recht die Ordner zu löschen.
+  error_user_has_not_right_delete_file: Der Nutzer hat kein Recht die Datei zu löschen.
+  notice_entries_deleted: Aufnahmen löschen
+  warning_some_entries_were_not_deleted: "Enige Aufnahmen wurden nich gelöscht: %{entries}"
+  question_do_you_really_want_to_delete_entries: Willst du wirklich die gewählten Aufnahmen löschen?
+  title_delete_checked: Lösch gewähltest
+  title_number_of_files_in_directory: Dateizahl in dem Ordner
+  title_filename_for_download: Dateiname benutzt zum Herunterladen oder ZIP-archivierung
+  label_number_of_folders: Order
+  label_number_of_documents: Dokumente
+  label_zip_names_encoding: ZIP-namen Kodierung
+  note_zip_names_encoding_iconv: Iconv ist benutzt zum Charset-konversion von utf-8 in Zielkodierung
+  error_file_storage_directory_does_not_exist: Ordner zum Dateispeichern existiert nicht und kann nicht gebildet.
+  error_file_can_not_be_created: Datei kann nicht in dem gewählten Ordner gebildet werden.
+  error_wrong_zip_encoding: Falsche ZIP-kodierung
+  warning_xapian_not_available: Xapian nicht zur Verfügung
+  menu_dmsf: DMS
+  label_physical_file_delete: Physisches Dateilöschen
+  user_is_not_project_member: Du bist kein Projektmitglied
+  heading_access_downloads_emails: Herunterladene/Emails
+  heading_access_first: Erste
+  heading_access_last: Letzte
+  label_dmsf_updated: DMS aktualisiert
+  title_total_size_of_all_files: Gesamtgröße aller Datein in diesem Ordner
+  project_module_dmsf: DMS
+  warning_no_project_to_copy_file_to: Kein Projekt für das Dateikopieren.
+  comment_copied_from: "Kopiert aus %{source}"
+  notice_file_copied: Datei kopiert
+  notice_file_moved: Datei verschoben
+  label_target_project: Zielprojekte
+  label_target_folder: Zielordner
+  title_copy_or_move: Kopieren/Verschieben
+  label_dmsf_folder_plural: Ordner
+  comment_moved_from: "Verschoben aus %{source}"
+  error_target_folder_same: Zielordner und Projekt sind dieselbe wie die Aktuelle.
+  error_file_cannot_be_moved: Die Datei kann nicht verschoben werden.
+  error_file_cannot_be_copied: Die Datei kann nicht kopiert werden.
+  warning_no_project_to_copy_folder_to: Kein Projekt für das Ordnerkopieren.
+  title_copy: Kopieren
+  error_folder_cannot_be_copied: Der Ordner kann nicht kopiert werden.
+  notice_folder_copied: Ordner kopiert
   
-  :error_max_email_filesize_exceeded: "Maximale Dateigröße der Anlage wurde überschritten. (%{number} MB)"
-  :note_maximum_email_filesize: "Maximale Dateigröße der Anlage. 0 bedeutet keinen Limit. Der Nummer ist in MB."
-  :label_maximum_email_filesize: "Maximale Dateigröße der Anlage"
-  :header_minimum_filesize: "Dateifehler wegen minimaler Dateigröße."
-  :error_minimum_filesize: "Die Datei %{file} ist 0 Bytes groß und wird deswegen nicht angehängt."
-  :parent_directory: "übergeordnetes Verzeichnis"
-  :note_webdav: "Nach der Aktivierung von WebDav kann der Dienst über die URL http(s)://.../dmsf/webdav/ erreicht werden."
-  :label_webdav: "Webdav Funktionalität"  
-  :label_dmsf_plural: "Kopieren von Dateien und Ordnern (%{files} Dateien in %{folders} Ordnern)"
+  error_max_email_filesize_exceeded: "Maximale Dateigröße der Anlage wurde überschritten. (%{number} MB)"
+  note_maximum_email_filesize: Maximale Dateigröße der Anlage. 0 bedeutet keinen Limit. Der Nummer ist in MB.
+  label_maximum_email_filesize: Maximale Dateigröße der Anlage
+  header_minimum_filesize: Dateifehler wegen minimaler Dateigröße.
+  error_minimum_filesize: "Die Datei %{file} ist 0 Bytes groß und wird deswegen nicht angehängt."
+  parent_directory: übergeordnetes Verzeichnis
+  note_webdav: "Nach der Aktivierung von WebDav kann der Dienst über die URL http(s)://.../dmsf/webdav/ erreicht werden."
+  label_webdav: Webdav Funktionalität
+  label_dmsf_plural: "Kopieren von Dateien und Ordnern (%{files} Dateien in %{folders} Ordnern)"
   
-  :warning_folder_already_locked: "Dieser Ordner ist bereits gesperrt"
-  :notice_folder_locked: "Der Ordner wurde erfolgreich gesperrt"
-  :warning_folder_not_locked: "Der Ordner konnte nicht gesperrt werden"
-  :notice_folder_unlocked: "Der Ordner wurde erfolgreich entsperrt"
-  :error_only_user_that_locked_folder_can_unlock_it: Sie haben keine Berechtigung zur Entsperrung des Ordners"
+  :warning_folder_already_locked: Dieser Ordner ist bereits gesperrt
+  :notice_folder_locked: Der Ordner wurde erfolgreich gesperrt
+  :warning_folder_not_locked: Der Ordner konnte nicht gesperrt werden
+  :notice_folder_unlocked: Der Ordner wurde erfolgreich entsperrt
+  :error_only_user_that_locked_folder_can_unlock_it: Sie haben keine Berechtigung zur Entsperrung des Ordners
   :title_folder_parent_locked: "Übergeordnetes Verzeichnis %{name} ist gesperrt"
   :title_file_parent_locked: "Übergeordnetes Verzeichnis %{name} ist gesperrt"
-  :title_unlock_folder: "Zur Modifikation für andere Benutzer entsperren"
-  :title_lock_folder: "Zum Schutz vor Modifikation durch andere Benutzer sperren"
+  :title_unlock_folder: Zur Modifikation für andere Benutzer entsperren
+  :title_lock_folder: Zum Schutz vor Modifikation durch andere Benutzer sperren
   
-  :select_option_webdav_readonly: "nur Lesen"
-  :select_option_webdav_readwrite: "Lesen/Schreiben"
-  :label_webdav_strategy: "Webdav Strategie"
-  :note_webdav_strategy: "Erlaubt dem Administrator den Wechsel der WebDav Nutzung zwischen nur lesend und auch schreibenden Zugriffen."
-  
\ No newline at end of file
+  :select_option_webdav_readonly: nur Lesen
+  :select_option_webdav_readwrite: Lesen/Schreiben
+  :label_webdav_strategy: Webdav Strategie
+  :note_webdav_strategy: Erlaubt dem Administrator den Wechsel der WebDav Nutzung zwischen nur lesend und auch schreibenden Zugriffen.
+  
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
+  error_empty_note: The note can't be empty
+  error_workflow_assign: An error occured while assigning
+  error_cannot_start_workflow: Workflow can't be started
+  error_cannot_renumber_steps: Steps can't be renumbered
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
+  label_dmsf_workflow_step: Step
+  label_dmsf_workflow_step_plural: Steps
+  label_dmsf_workflow_approval: Approval
+  label_dmsf_workflow_approval_plural: Approvals
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Approve
+  label_dmsf_wokflow_action_reject: Reject
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
+  label_action: Action
+  label_note: Note  
+  title_none: None
+  title_rejection: Rejection
+  title_delegation: Delegation
+  title_assignment: Assignment
+  title_start: Start  
+  title_dmsf_workflow_log: Approval Workflow Log
+  title_assigned: Assigned
+  title_approval: Approval
+  title_rejected: Rejected
+  dmsf_and: AND
+  dmsf_or: OR
+  dmsf_new_step: New step  
+  message_dmsf_wokflow_note: Your note...
+  info_revision: "r%{rev}"
+  link_workflow: Workflow  
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 79843539..108c562d 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,220 +1,219 @@
 # English translation for DMSF by vit.jonas@gmail.com, dan.munn@munnster.co.uk
 en:
-  :dmsf: "DMSF"
-  :label_dmsf_file_plural: "Dmsf files"
-  :warning_no_entries_selected: "No entries selected"
-  :error_email_to_must_be_entered: "Email To must be entered"
-  :notice_email_sent: "Email sent"
-  :warning_file_already_locked: "File already locked"
-  :notice_file_locked: "File locked"
-  :warning_file_not_locked: "File not locked"
-  :notice_file_unlocked: "File unlocked"
-  :error_only_user_that_locked_file_can_unlock_it: "Only user that locked file can unlock it"
-  :question_do_you_really_want_to_delete_this_entry: "Do you really want to delete this entry?"
-  :error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
-  :question_do_you_really_want_to_delete_this_revision: "Do you really want to delete this revision?"
-  :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
-  :notice_folder_created: "Folder created"
-  :error_folder_creation_failed: "Folder creation failed"
-  :error_folder_title_must_be_entered: "Title must be entered"
-  :notice_folder_deleted: "Folder deleted"
-  :error_folder_is_not_empty: "Folder is not empty"
-  :error_folder_title_is_already_used: "Title is already used"
-  :notice_folder_details_were_saved: "Folder details were saved"
-  :error_file_is_locked: "File is locked"
-  :notice_file_deleted: "File deleted"
-  :error_at_least_one_revision_must_be_present: "At least one revision must be present"
-  :notice_revision_deleted: "Revision deleted"
-  :warning_one_of_files_locked: "One of files locked"
-  :notice_file_unlocked: "File unlocked"
-  :notice_file_revision_created: "File revision created"
-  :notice_your_preferences_were_saved: "Your preferences were saved"
-  :warning_folder_notifications_already_activated: "Folder notifications already activated"
-  :notice_folder_notifications_activated: "Folder notifications activated"
-  :warning_folder_notifications_already_deactivated: "Folder notifications already deactivated"
-  :notice_folder_notifications_deactivated: "Folder notifications deactivated"
-  :warning_file_notifications_already_activated: "File notifications already activated"
-  :notice_file_notifications_activated: "File notifications activated"
-  :warning_file_notifications_already_deactivated: "File notifications already deactivated"
-  :notice_file_notifications_deactivated: "File notifications deactivated"
-  :link_details: "%{title} details"
-  :link_edit: "Edit %{title}"
-  :submit_create: "Create"
-  :link_create_folder: "Create folder"
-  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
-  :link_title: "Title"
-  :link_size: "Size"
-  :link_modified: "Modified"
-  :link_ver: "Ver."
-  :link_author: "Author"
-  :title_check_for_zip_download_or_email: "Check for Zip download or email"
-  :title_delete: "Delete"
-  :title_notifications_active_deactivate: "Notifications active: Deactivate"
-  :title_notifications_not_active_activate: "Notifications not active: Activate"
-  :title_title_version_version_download: "%{title} version %{version} download"
-  :title_locked_by_user: "Locked by %{user}"
-  :title_locked_by_you: "Locked by you"
-  :title_waiting_for_approval: "Waiting for Approval"
-  :title_approved: "Approved"  
-  :title_unlock_file: "Unlock to allow changes for other members"
-  :title_lock_file: "Lock to prevent changes for other members"
-  :submit_download: "Download"
-  :title_download_checked: "Download checked in Zip archive"
-  :submit_email: "Email"
-  :title_send_checked_by_email: "Send checked by email"
-  :link_user_preferences: "Your DMSF project preferences"
-  :heading_send_documents_by_email: "Send documents by email"
-  :label_email_from: "From"
-  :label_email_to: "To"
-  :label_email_cc: "CC"
-  :label_email_subject: "Subject"
-  :label_email_documents: "Documents"
-  :label_email_body: "Body"
-  :label_email_send: "Send"
-  :title_notifications_active: "Notifications active"
-  :label_file_size: "File size"
-  :heading_file_upload: "Upload"
-  :note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once."
-  :note_upload_files_greater_than_two_gb: "To upload files greater than 2GB you must have 64b browser."
-  :submit_upload_files: "Upload"
-  :heading_new_folder: "New Folder"
-  :label_title: "Title"
-  :label_description: "Description"
-  :submit_save: "Save"
-  :info_file_locked: "File locked!"
-  :label_notifications: "Notifications"
-  :select_option_default: "Default"
-  :select_option_deactivated: "Deactivated"
-  :select_option_activated: "Activated"
-  :title_save_preferences: "Save preferences"
-  :heading_revisions: "Revisions"
-  :title_download: "Download"
-  :title_delete_revision: "Delete revision"
-  :label_created: "Created"
-  :label_changed: "Changed"
-  :info_changed_by_user: "%{changed} by"
-  :label_filename: "Filename"
-  :label_version: "Version"
-  :label_workflow: "Workflow"  
-  :option_workflow_none: "None"
-  :label_mime: "Mime"
-  :label_size: "Size"
-  :label_comment: "Comment"
-  :heading_new_revision: "New Revision"
-  :option_version_same: "Same"
-  :option_version_minor: "Minor"
-  :option_version_major: "Major"
-  :label_new_content: "New content"
-  :label_maximum_files_upload: "Maximum files upload"
-  :note_maximum_number_of_files_uploaded: "Limits maximum number of files uploaded at once. 0 means unlimited."
-  :label_maximum_files_download: "Maximum files download"
-  :note_maximum_number_of_files_downloaded: "Limits maximum number of files downloaded in zip or sent via email. 0 means unlimited."
-  :label_file_storage_directory: "File storage directory"
-  :label_index_database: "Index database"
-  :label_stemming_language: "Stemming Language"
-  :note_possible_values: "Possible values"
-  :note_pass_none_to_disable_stemming: "pass 'none' to disable stemming"
-  :label_stem_strategy: "Stem strategy"
-  :option_stem_none: "Stem none (default)"
-  :option_stem_some: "Stem some"
-  :option_stem_all: "Stem all"
-  :label_stemming_description: "This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are"
-  :note_do_not_stem: "Don't perform any stemming."
-  :note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'."
-  :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)."
-  :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed."
-  :label_default_notifications: "File default notifications"
-  :heading_uploaded_files: "Uploaded Files"
-  :submit_commit: "Commit"
-  :link_documents: "Documents"
-  :permission_view_dmsf_folders: "Browse documents"
-  :permission_user_preferences: "User preferences"
-  :permission_view_dmsf_files: "View documents"
-  :permission_folder_manipulation: "Folder manipulation"
-  :permission_file_manipulation: "File manipulation"
-  :permission_file_approval: "File approval"
-  :permission_force_file_unlock: "Force file unlock"
-  :label_file: "File"
-  :field_folder: "Folder"
-  :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
-  :error_contains_invalid_character: "contains invalid character(s)"
-  :error_file_commit_require_uploaded_file: "File commit require uploaded file"
-  :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}"
-  :error_user_has_not_right_delete_folder: "User hasn't right to delete forders"
-  :error_user_has_not_right_delete_file: "User hasn't right to delete file"
-  :notice_entries_deleted: "Entries deleted"
-  :warning_some_entries_were_not_deleted: "Some entries weren't deleted: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "Do you really want to delete checked entries?"
-  :title_delete_checked: "Delete checked"
-  :title_number_of_files_in_directory: "Number of files in directory"
-  :title_filename_for_download: "Filename used for download or in Zip archive"
-  :label_number_of_folders: "Folders"
-  :label_number_of_documents: "Documents"
-  :label_zip_names_encoding: "Zip names encoding"
-  :note_zip_names_encoding_iconv: "Iconv is used for charset conversion from utf-8 to target encoding"
-  :error_file_storage_directory_does_not_exist: "File storage directory doesn't exist and can't be created"
-  :error_file_can_not_be_created: "File can't be created in storage directory"
-  :error_wrong_zip_encoding: "Wrong Zip encoding"
-  :warning_xapian_not_available: "Xapian not available"
-  :menu_dmsf: "DMSF"
-  :label_physical_file_delete: "Physical file delete"
-  :user_is_not_project_member: "You are not member of the project"
-  :heading_access_downloads_emails: "Downloads/Emails"
-  :heading_access_first: "First"
-  :heading_access_last: "Last"
-  :label_dmsf_updated: "DMSF updated"
-  :title_total_size_of_all_files: "Total size of all files under this folder"
-  :project_module_dmsf: "DMSF"
-  :warning_no_project_to_copy_file_to: "No project to copy file to"
-  :comment_copied_from: "Copied from %{source}"
-  :notice_file_copied: "File copied"
-  :notice_file_moved: "File moved"
-  :label_target_project: "Target project"
-  :label_target_folder: "Target folder"
-  :title_copy_or_move: "Copy/Move"
-  :label_dmsf_folder_plural: "Dmsf folders"
-  :comment_moved_from: "Moved from %{source}"
-  :error_target_folder_same: "Target folder and project are the same as current"
-  :error_file_cannot_be_moved: "File can't be moved"
-  :error_file_cannot_be_copied: "File can't be copied"
-  :warning_no_project_to_copy_folder_to: "No project to copy folder to"
-  :title_copy: "Copy"
-  :error_folder_cannot_be_copied: "Folder can't be copied"
-  :notice_folder_copied: "Folder copied"
+  dmsf: DMSF
+  label_dmsf_file_plural: Dmsf files
+  warning_no_entries_selected: No entries selected
+  error_email_to_must_be_entered: Email To must be entered
+  notice_email_sent: Email sent
+  warning_file_already_locked: File already locked
+  notice_file_locked: File locked
+  warning_file_not_locked: File not locked
+  notice_file_unlocked: File unlocked
+  error_only_user_that_locked_file_can_unlock_it: Only user that locked file can unlock it
+  question_do_you_really_want_to_delete_this_entry: Do you really want to delete this entry?
+  error_max_files_exceeded: "Limit for %{number} simultaneously downloaded files exceeded"
+  question_do_you_really_want_to_delete_this_revision: Do you really want to delete this revision?
+  error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
+  notice_folder_created: Folder created
+  error_folder_creation_failed: Folder creation failed
+  error_folder_title_must_be_entered: Title must be entered
+  notice_folder_deleted: Folder deleted
+  error_folder_is_not_empty: Folder is not empty
+  error_folder_title_is_already_used: Title is already used
+  notice_folder_details_were_saved: Folder details were saved
+  error_file_is_locked: File is locked
+  notice_file_deleted: File deleted
+  error_at_least_one_revision_must_be_present: At least one revision must be present
+  notice_revision_deleted: Revision deleted
+  warning_one_of_files_locked: One of files locked
+  notice_file_unlocked: File unlocked
+  notice_file_revision_created: File revision created
+  notice_your_preferences_were_saved: Your preferences were saved
+  warning_folder_notifications_already_activated: Folder notifications already activated
+  notice_folder_notifications_activated: Folder notifications activated
+  warning_folder_notifications_already_deactivated: Folder notifications already deactivated
+  notice_folder_notifications_deactivated: Folder notifications deactivated
+  warning_file_notifications_already_activated: File notifications already activated
+  notice_file_notifications_activated: File notifications activated
+  warning_file_notifications_already_deactivated: File notifications already deactivated
+  notice_file_notifications_deactivated: File notifications deactivated
+  link_details: "%{title} details"
+  link_edit: "Edit %{title}"
+  submit_create: Create
+  link_create_folder: Create folder
+  title_check_uncheck_all_for_zip_download_or_email: Check/Uncheck all for zip download or email
+  link_title: Title
+  link_size: Size
+  link_modified: Modified
+  link_ver: Ver.
+  link_author: Author
+  title_check_for_zip_download_or_email: Check for Zip download or email
+  title_delete: Delete
+  title_notifications_active_deactivate: "Notifications active: Deactivate"
+  title_notifications_not_active_activate: "Notifications not active: Activate"
+  title_title_version_version_download: "%{title} version %{version} download"
+  title_locked_by_user: "Locked by %{user}"
+  title_locked_by_you: Locked by you
+  title_waiting_for_approval: Waiting for Approval
+  title_approved: Approved
+  title_unlock_file: Unlock to allow changes for other members
+  title_lock_file: Lock to prevent changes for other members
+  submit_download: Download
+  title_download_checked: Download checked in Zip archive
+  submit_email: Email
+  title_send_checked_by_email: Send checked by email
+  link_user_preferences: Your DMSF project preferences
+  heading_send_documents_by_email: Send documents by email
+  label_email_from: From
+  label_email_to: To
+  label_email_cc: CC
+  label_email_subject: Subject
+  label_email_documents: Documents
+  label_email_body: Body
+  label_email_send: Send
+  title_notifications_active: Notifications active
+  label_file_size: File size
+  heading_file_upload: Upload
+  note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once."
+  note_upload_files_greater_than_two_gb: To upload files greater than 2GB you must have 64b browser.
+  submit_upload_files: Upload
+  heading_new_folder: New Folder
+  label_title: Title
+  label_description: Description
+  submit_save: Save
+  info_file_locked: File locked!
+  label_notifications: Notifications
+  select_option_default: Default
+  select_option_deactivated: Deactivated
+  select_option_activated: Activated
+  title_save_preferences: Save preferences
+  heading_revisions: Revisions
+  title_download: Download
+  title_delete_revision: Delete revision
+  label_created: Created
+  label_changed: Changed
+  info_changed_by_user: "%{changed} by"
+  label_filename: Filename
+  label_version: Version
+  label_workflow: Workflow
+  label_mime: Mime
+  label_size: Size
+  label_comment: Comment
+  heading_new_revision: New Revision
+  option_version_same: Same
+  option_version_minor: Minor
+  option_version_major: Major
+  label_new_content: New content
+  label_maximum_files_upload: Maximum files upload
+  note_maximum_number_of_files_uploaded: Limits maximum number of files uploaded at once. 0 means unlimited.
+  label_maximum_files_download: Maximum files download
+  note_maximum_number_of_files_downloaded: Limits maximum number of files downloaded in zip or sent via email. 0 means unlimited.
+  label_file_storage_directory: File storage directory
+  label_index_database: Index database
+  label_stemming_language: Stemming Language
+  note_possible_values: Possible values
+  note_pass_none_to_disable_stemming: "pass 'none' to disable stemming"
+  label_stem_strategy: Stem strategy
+  option_stem_none: Stem none (default)
+  option_stem_some: Stem some
+  option_stem_all: Stem all
+  label_stemming_description: This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are
+  note_do_not_stem: "Don't perform any stemming."
+  note_stem_some: Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'.
+  note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)."
+  note_stemming_applied: Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed.
+  label_default_notifications: File default notifications
+  heading_uploaded_files: Uploaded Files
+  submit_commit: Commit
+  link_documents: Documents
+  permission_view_dmsf_folders: Browse documents
+  permission_user_preferences: User preferences
+  permission_view_dmsf_files: View documents
+  permission_folder_manipulation: Folder manipulation
+  permission_file_manipulation: File manipulation
+  permission_file_approval: File approval
+  permission_force_file_unlock: Force file unlock
+  label_file: File
+  field_folder: Folder
+  error_create_cycle_in_folder_dependency: create cycle in folder dependency
+  error_contains_invalid_character: contains invalid character(s)
+  error_file_commit_require_uploaded_file: File commit require uploaded file
+  warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}"
+  error_user_has_not_right_delete_folder: "User hasn't right to delete forders"
+  error_user_has_not_right_delete_file: "User hasn't right to delete file"
+  notice_entries_deleted: Entries deleted
+  warning_some_entries_were_not_deleted: "Some entries weren't deleted: %{entries}"
+  question_do_you_really_want_to_delete_entries: Do you really want to delete checked entries?
+  title_delete_checked: Delete checked
+  title_number_of_files_in_directory: Number of files in directory
+  title_filename_for_download: Filename used for download or in Zip archive
+  label_number_of_folders: Folders
+  label_number_of_documents: Documents
+  label_zip_names_encoding: Zip names encoding
+  note_zip_names_encoding_iconv: Iconv is used for charset conversion from utf-8 to target encoding
+  error_file_storage_directory_does_not_exist: "File storage directory doesn't exist and can't be created"
+  error_file_can_not_be_created: "File can't be created in storage directory"
+  error_wrong_zip_encoding: Wrong Zip encoding
+  warning_xapian_not_available: Xapian not available
+  menu_dmsf: DMSF
+  label_physical_file_delete: Physical file delete
+  user_is_not_project_member: You are not member of the project
+  heading_access_downloads_emails: Downloads/Emails
+  heading_access_first: First
+  heading_access_last: Last
+  label_dmsf_updated: DMSF updated
+  title_total_size_of_all_files: Total size of all files under this folder
+  project_module_dmsf: DMSF
+  warning_no_project_to_copy_file_to: No project to copy file to
+  comment_copied_from: "Copied from %{source}"
+  notice_file_copied: File copied
+  notice_file_moved: File moved
+  label_target_project: Target project
+  label_target_folder: Target folder
+  title_copy_or_move: Copy/Move
+  label_dmsf_folder_plural: Dmsf folders
+  comment_moved_from: "Moved from %{source}"
+  error_target_folder_same: Target folder and project are the same as current
+  error_file_cannot_be_moved: "File can't be moved"
+  error_file_cannot_be_copied: "File can't be copied"
+  warning_no_project_to_copy_folder_to: No project to copy folder to
+  title_copy: Copy
+  error_folder_cannot_be_copied: "Folder can't be copied"
+  notice_folder_copied: Folder copied
   
-  :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
-  :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
-  :label_maximum_email_filesize: "Maximum email attachment size"
-  :header_minimum_filesize: "File Error."
-  :error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
-  :parent_directory: "Parent Directory"
-  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
-  :label_webdav: "Webdav functionality"
-  :label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
+  error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
+  note_maximum_email_filesize: Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB.
+  label_maximum_email_filesize: Maximum email attachment size
+  header_minimum_filesize: File Error.
+  error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
+  parent_directory: Parent Directory
+  note_webdav: Webdav once enabled can be found at http://.../dmsf/webdav/
+  label_webdav: Webdav functionality
+  label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
 
-  :warning_folder_already_locked: "This folder is already locked"
-  :notice_folder_locked: "The folder was successfully locked"
-  :warning_folder_not_locked: "Unfortunately, the folder could not be locked"
-  :notice_folder_unlocked: "The folder was successfully unlocked"
-  :error_only_user_that_locked_folder_can_unlock_it: "You are not authorised to unlock this folder"
-  :title_folder_parent_locked: "Parent folder %{name} is locked"
-  :title_file_parent_locked: "Parent folder %{name} is locked"
-  :title_unlock_folder: "Unlock to allow changes for other members"
-  :title_lock_folder: "Lock to prevent changes for other members"
+  warning_folder_already_locked: This folder is already locked
+  notice_folder_locked: The folder was successfully locked
+  warning_folder_not_locked: Unfortunately, the folder could not be locked
+  notice_folder_unlocked: The folder was successfully unlocked
+  error_only_user_that_locked_folder_can_unlock_it: You are not authorised to unlock this folder
+  title_folder_parent_locked: "Parent folder %{name} is locked"
+  title_file_parent_locked: "Parent folder %{name} is locked"
+  title_unlock_folder: Unlock to allow changes for other members
+  title_lock_folder: Lock to prevent changes for other members
 
-  :select_option_webdav_readonly: "Read-only"
-  :select_option_webdav_readwrite: "Read/Write"
-  :label_webdav_strategy: "Webdav strategy"
-  :note_webdav_strategy: "Enables the administrator to decide if webdav is a read-only or read-write platform for end users."
+  select_option_webdav_readonly: Read-only
+  select_option_webdav_readwrite: Read/Write
+  label_webdav_strategy: Webdav strategy
+  note_webdav_strategy: Enables the administrator to decide if webdav is a read-only or read-write platform for end users.  
   
-  error_unable_delete_dmsf_workflow: 'Unable to delete the workflow'
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
   error_empty_note: "The note can't be empty"
-  error_workflow_assign: 'An error occured while assigning'
+  error_workflow_assign: An error occured while assigning
   error_cannot_start_workflow: "Workflow can't be started"
   error_cannot_renumber_steps: "Steps can't be renumbered"
-  label_dmsf_workflow_new: 'New approval workflow'
-  label_dmsf_workflow: 'Approval Workflow'
-  label_dmsf_workflow_plural: 'Approval workflows'  
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
   label_dmsf_workflow_step: Step
   label_dmsf_workflow_step_plural: Steps
   label_dmsf_workflow_approval: Approval
@@ -222,9 +221,9 @@ en:
   label_dmsf: DMSF
   label_dmsf_wokflow_action_approve: Approve
   label_dmsf_wokflow_action_reject: Reject
-  label_dmsf_wokflow_action_delegate: 'Delegate to'
-  label_dmsf_wokflow_action_assign: 'Assign an approval workflow'
-  label_dmsf_wokflow_action_start: 'Start workflow'
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
   label_action: Action
   label_note: Note  
   title_none: None
@@ -232,7 +231,7 @@ en:
   title_delegation: Delegation
   title_assignment: Assignment
   title_start: Start  
-  title_dmsf_workflow_log: 'Approval Workflow Log'
+  title_dmsf_workflow_log: Approval Workflow Log
   title_assigned: Assigned
   title_approval: Approval
   title_rejected: Rejected
@@ -242,4 +241,4 @@ en:
   message_dmsf_wokflow_note: Your note...
   info_revision: "r%{rev}"
   link_workflow: Workflow  
-  notice_workflow_started: 'Approval workflow successfully started'
\ No newline at end of file
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file
diff --git a/config/locales/es.yml b/config/locales/es.yml
index a390e261..7139fc19 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,213 +1,246 @@
 # Spanish translation for DMSF
 es:
-  :dmsf: "DMSF"
-  :label_dmsf_file_plural: "DMSF Archivos"
-  :warning_no_entries_selected: "No ha seleccionado ningún ítem"
-  :error_email_to_must_be_entered: "Ingrese un email"
-  :notice_email_sent: "Email sent"
-  :warning_file_already_locked: "El archivo ya está bloqueado"
-  :notice_file_locked: "Archivo bloqueado"
-  :warning_file_not_locked: "Archivo no bloqueado"
-  :notice_file_unlocked: "Archivo desbloqueado"
-  :error_only_user_that_locked_file_can_unlock_it: "Solo los usuarios que bloquearon previamente al archivo lo pueden desbloquear"
-  :question_do_you_really_want_to_delete_this_entry: "¿Está seguro de borrar el ítem seleccionado?"
-  :error_max_files_exceeded: "Se excedio el numero permitido de archivos bajados de manera simultánea: "
-  :question_do_you_really_want_to_delete_this_revision: "¿Está seguro de borrar la revision seleccionada?"
-  :error_entry_project_does_not_match_current_project: "Las entradas del proyecto no concuerdan con el proyecto seleccionado"
-  :notice_folder_created: "Carpeta creada satisfactoriamente"
-  :error_folder_creation_failed: "La creacion de la carpeta ha fallado"
-  :error_folder_title_must_be_entered: "Debe ingresar un título"
-  :notice_folder_deleted: "Carpeta borrada"
-  :error_folder_is_not_empty: "La carpeta no está vacía"
-  :error_folder_title_is_already_used: "El título ingresado ya está siendo usado por otro documento"
-  :notice_folder_details_were_saved: "Los detalles de la carpeta fueron grabados correctamente"
-  :error_file_is_locked: "Archivo bloqueado"
-  :notice_file_deleted: "Archivo borrado"
-  :error_at_least_one_revision_must_be_present: "al menos una revisión debe estar presente"
-  :notice_revision_deleted: "Revision eliminada correctamente"
-  :warning_one_of_files_locked: "Uno de los archivos está bloqueado"
-  :notice_file_unlocked: "Archivo desbloqueado"
-  :notice_file_revision_created: "Revision de archivos creada correctamente"
-  :notice_your_preferences_were_saved: "Sus preferencias han sido guardadas correctamente"
-  :warning_folder_notifications_already_activated: "Las notificaciones de la carpeta seleccionada ya están activadas previamente"
-  :notice_folder_notifications_activated: "Notificaciones de carpeta activadas"
-  :warning_folder_notifications_already_deactivated: "Las notificaciones de la carpeta seleccionada ya están desactivadas previamente"
-  :notice_folder_notifications_deactivated: "Notificaciones de carpeta desactivadas"
-  :warning_file_notifications_already_activated: "Las notificaciones del archivo seleccionado ya estaban activadas previamente"
-  :notice_file_notifications_activated: "Notificación de archivo activado"
-  :warning_file_notifications_already_deactivated: "Las notificaciones del archivo seleccionado ya estaban desactivadas previamente"
-  :notice_file_notifications_deactivated: "Notificación de archivo desactivada"  
-  :link_details: "%{title} details"
+  dmsf: DMSF
+  label_dmsf_file_plural: DMSF Archivos
+  warning_no_entries_selected: No ha seleccionado ningún ítem
+  error_email_to_must_be_entered: Ingrese un email
+  notice_email_sent: Email sent
+  warning_file_already_locked: El archivo ya está bloqueado
+  notice_file_locked: Archivo bloqueado
+  warning_file_not_locked: Archivo no bloqueado
+  notice_file_unlocked: Archivo desbloqueado
+  error_only_user_that_locked_file_can_unlock_it: Solo los usuarios que bloquearon previamente al archivo lo pueden desbloquear
+  question_do_you_really_want_to_delete_this_entry: ¿Está seguro de borrar el ítem seleccionado?
+  error_max_files_exceeded: "Se excedio el numero permitido de archivos bajados de manera simultánea:"
+  question_do_you_really_want_to_delete_this_revision: ¿Está seguro de borrar la revision seleccionada?
+  error_entry_project_does_not_match_current_project: Las entradas del proyecto no concuerdan con el proyecto seleccionado
+  notice_folder_created: Carpeta creada satisfactoriamente
+  error_folder_creation_failed: La creacion de la carpeta ha fallado
+  error_folder_title_must_be_entered: Debe ingresar un título
+  notice_folder_deleted: Carpeta borrada
+  error_folder_is_not_empty: La carpeta no está vacía
+  error_folder_title_is_already_used: El título ingresado ya está siendo usado por otro documento
+  notice_folder_details_were_saved: Los detalles de la carpeta fueron grabados correctamente
+  error_file_is_locked: Archivo bloqueado
+  notice_file_deleted: Archivo borrado
+  error_at_least_one_revision_must_be_present: al menos una revisión debe estar presente
+  notice_revision_deleted: Revision eliminada correctamente
+  warning_one_of_files_locked: Uno de los archivos está bloqueado
+  notice_file_unlocked: Archivo desbloqueado
+  notice_file_revision_created: Revision de archivos creada correctamente
+  notice_your_preferences_were_saved: Sus preferencias han sido guardadas correctamente
+  warning_folder_notifications_already_activated: Las notificaciones de la carpeta seleccionada ya están activadas previamente
+  notice_folder_notifications_activated: Notificaciones de carpeta activadas
+  warning_folder_notifications_already_deactivated: Las notificaciones de la carpeta seleccionada ya están desactivadas previamente
+  notice_folder_notifications_deactivated: Notificaciones de carpeta desactivadas
+  warning_file_notifications_already_activated: Las notificaciones del archivo seleccionado ya estaban activadas previamente
+  notice_file_notifications_activated: Notificación de archivo activado
+  warning_file_notifications_already_deactivated: Las notificaciones del archivo seleccionado ya estaban desactivadas previamente
+  notice_file_notifications_deactivated: Notificación de archivo desactivada
   
-# Not translated  
+  # Not translated
+  link_details: "%{title} details"
+  link_edit: "Edit %{title}"
+  submit_create: Create
+  link_create_folder: Create folder
+  title_check_uncheck_all_for_zip_download_or_email: Check/Uncheck all for zip download or email
+  link_title: Title
+  link_size: Size
+  link_modified: Modified
+  link_ver: Ver.
+  link_author: Author
+  title_check_for_zip_download_or_email: Check for Zip download or email
+  title_delete: Delete
+  title_notifications_active_deactivate: "Notifications active: Deactivate"
+  title_notifications_not_active_activate: "Notifications not active: Activate"
+  title_title_version_version_download: "%{title} version %{version} download"
+  title_locked_by_user: "Locked by %{user}"
+  title_locked_by_you: Locked by you
+  title_waiting_for_approval: Waiting for Approval
+  title_approved: Approved
+  title_unlock_file: Unlock to allow changes for other members
+  title_lock_file: Lock to prevent changes for other members
+  submit_download: Download
+  title_download_checked: Download checked in Zip archive
+  submit_email: Email
+  title_send_checked_by_email: Send checked by email
+  link_user_preferences: Your DMSF project preferences
+  heading_send_documents_by_email: Send documents by email
+  label_email_from: From
+  label_email_to: To
+  label_email_cc: CC
+  label_email_subject: Subject
+  label_email_documents: Documents
+  label_email_body: Body
+  label_email_send: Send
+  title_notifications_active: Notifications active
+  label_file_size: File size
+  heading_file_upload: Upload
+  note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once."
+  note_upload_files_greater_than_two_gb: To upload files greater than 2GB you must have 64b browser.
+  submit_upload_files: Upload
+  heading_new_folder: New Folder
+  label_title: Title
+  label_description: Description
+  submit_save: Save
+  info_file_locked: File locked!
+  label_notifications: Notifications
+  select_option_default: Default
+  select_option_deactivated: Deactivated
+  select_option_activated: Activated
+  title_save_preferences: Save preferences
+  heading_revisions: Revisions
+  title_download: Download
+  title_delete_revision: Delete revision
+  label_created: Created
+  label_changed: Changed
+  info_changed_by_user: "%{changed} by"
+  label_filename: Filename
+  label_version: Version
+  label_workflow: Workflow
+  label_mime: Mime
+  label_size: Size
+  label_comment: Comment
+  heading_new_revision: New Revision
+  option_version_same: Same
+  option_version_minor: Minor
+  option_version_major: Major
+  label_new_content: New content
+  label_maximum_files_upload: Maximum files upload
+  note_maximum_number_of_files_uploaded: Limits maximum number of files uploaded at once. 0 means unlimited.
+  label_maximum_files_download: Maximum files download
+  note_maximum_number_of_files_downloaded: Limits maximum number of files downloaded in zip or sent via email. 0 means unlimited.
+  label_file_storage_directory: File storage directory
+  label_index_database: Index database
+  label_stemming_language: Stemming Language
+  note_possible_values: Possible values
+  note_pass_none_to_disable_stemming: "pass 'none' to disable stemming"
+  label_stem_strategy: Stem strategy
+  option_stem_none: Stem none (default)
+  option_stem_some: Stem some
+  option_stem_all: Stem all
+  label_stemming_description: This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are
+  note_do_not_stem: "Don't perform any stemming."
+  note_stem_some: Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'.
+  note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)."
+  note_stemming_applied: Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed.
+  label_default_notifications: File default notifications
+  heading_uploaded_files: Uploaded Files
+  submit_commit: Commit
+  link_documents: Documents
+  permission_view_dmsf_folders: Browse documents
+  permission_user_preferences: User preferences
+  permission_view_dmsf_files: View documents
+  permission_folder_manipulation: Folder manipulation
+  permission_file_manipulation: File manipulation
+  permission_file_approval: File approval
+  permission_force_file_unlock: Force file unlock
+  label_file: File
+  field_folder: Folder
+  error_create_cycle_in_folder_dependency: create cycle in folder dependency
+  error_contains_invalid_character: contains invalid character(s)
+  error_file_commit_require_uploaded_file: File commit require uploaded file
+  warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}"
+  error_user_has_not_right_delete_folder: "User hasn't right to delete forders"
+  error_user_has_not_right_delete_file: "User hasn't right to delete file"
+  notice_entries_deleted: Entries deleted
+  warning_some_entries_were_not_deleted: "Some entries weren't deleted: %{entries}"
+  question_do_you_really_want_to_delete_entries: Do you really want to delete checked entries?
+  title_delete_checked: Delete checked
+  title_number_of_files_in_directory: Number of files in directory
+  title_filename_for_download: Filename used for download or in Zip archive
+  label_number_of_folders: Folders
+  label_number_of_documents: Documents
+  label_zip_names_encoding: Zip names encoding
+  note_zip_names_encoding_iconv: Iconv is used for charset conversion from utf-8 to target encoding
+  error_file_storage_directory_does_not_exist: "File storage directory doesn't exist and can't be created"
+  error_file_can_not_be_created: "File can't be created in storage directory"
+  error_wrong_zip_encoding: Wrong Zip encoding
+  warning_xapian_not_available: Xapian not available
+  menu_dmsf: DMSF
+  label_physical_file_delete: Physical file delete
+  user_is_not_project_member: You are not member of the project
+  heading_access_downloads_emails: Downloads/Emails
+  heading_access_first: First
+  heading_access_last: Last
+  label_dmsf_updated: DMSF updated
+  title_total_size_of_all_files: Total size of all files under this folder
+  project_module_dmsf: DMSF
+  warning_no_project_to_copy_file_to: No project to copy file to
+  comment_copied_from: "Copied from %{source}"
+  notice_file_copied: File copied
+  notice_file_moved: File moved
+  label_target_project: Target project
+  label_target_folder: Target folder
+  title_copy_or_move: Copy/Move
+  label_dmsf_folder_plural: Dmsf folders
+  comment_moved_from: "Moved from %{source}"
+  error_target_folder_same: Target folder and project are the same as current
+  error_file_cannot_be_moved: "File can't be moved"
+  error_file_cannot_be_copied: "File can't be copied"
+  warning_no_project_to_copy_folder_to: No project to copy folder to
+  title_copy: Copy
+  error_folder_cannot_be_copied: "Folder can't be copied"
+  notice_folder_copied: Folder copied
   
-  :link_edit: "Edit %{title}"
-  :submit_create: "Create"
-  :link_create_folder: "Create folder"
-  :title_check_uncheck_all_for_zip_download_or_email: "Check/Uncheck all for zip download or email"
-  :link_title: "Title"
-  :link_size: "Size"
-  :link_modified: "Modified"
-  :link_ver: "Ver."
-  :link_author: "Author"
-  :title_check_for_zip_download_or_email: "Check for Zip download or email"
-  :title_delete: "Delete"
-  :title_notifications_active_deactivate: "Notifications active: Deactivate"
-  :title_notifications_not_active_activate: "Notifications not active: Activate"
-  :title_title_version_version_download: "%{title} version %{version} download"
-  :title_locked_by_user: "Locked by %{user}"
-  :title_locked_by_you: "Locked by you"
-  :title_waiting_for_approval: "Waiting for Approval"
-  :title_approved: "Approved"
-  :title_unlock_file: "Unlock to allow changes for other members"
-  :title_lock_file: "Lock to prevent changes for other members"
-  :submit_download: "Download"
-  :title_download_checked: "Download checked in Zip archive"
-  :submit_email: "Email"
-  :title_send_checked_by_email: "Send checked by email"
-  :link_user_preferences: "Your DMSF project preferences"
-  :heading_send_documents_by_email: "Send documents by email"
-  :label_email_from: "From"
-  :label_email_to: "To"
-  :label_email_cc: "CC"
-  :label_email_subject: "Subject"
-  :label_email_documents: "Documents"
-  :label_email_body: "Body"
-  :label_email_send: "Send"
-  :title_notifications_active: "Notifications active"
-  :label_file_size: "File size"
-  :heading_file_upload: "Upload"
-  :note_uploaded_maximum_files_at_once: "There can be uploaded maximum of %{number} files at once."
-  :note_upload_files_greater_than_two_gb: "To upload files greater than 2GB you must have 64b browser."
-  :submit_upload_files: "Upload"
-  :heading_new_folder: "New Folder"
-  :label_title: "Title"
-  :label_description: "Description"
-  :submit_save: "Save"
-  :info_file_locked: "File locked!"
-  :label_notifications: "Notifications"
-  :select_option_default: "Default"
-  :select_option_deactivated: "Deactivated"
-  :select_option_activated: "Activated"
-  :title_save_preferences: "Save preferences"
-  :heading_revisions: "Revisions"
-  :title_download: "Download"
-  :title_delete_revision: "Delete revision"
-  :label_created: "Created"
-  :label_changed: "Changed"
-  :info_changed_by_user: "%{changed} by %{user}"
-  :label_filename: "Filename"
-  :label_version: "Version"
-  :label_workflow: "Workflow"
-  :option_workflow_waiting_for_approval: "Waiting for approval"
-  :option_workflow_approved: "Approved"
-  :option_workflow_none: "None"
-  :label_mime: "Mime"
-  :label_size: "Size"
-  :label_comment: "Comment"
-  :heading_new_revision: "New Revision"
-  :option_version_same: "Same"
-  :option_version_minor: "Minor"
-  :option_version_major: "Major"
-  :label_new_content: "New content"
-  :label_maximum_files_upload: "Maximum files upload"
-  :note_maximum_number_of_files_uploaded: "Limits maximum number of files uploaded at once. 0 means unlimited."
-  :label_maximum_files_download: "Maximum files download"
-  :note_maximum_number_of_files_downloaded: "Limits maximum number of files downloaded in zip or sent via email. 0 means unlimited."
-  :label_file_storage_directory: "File storage directory"
-  :label_index_database: "Index database"
-  :label_stemming_language: "Stemming Language"
-  :note_possible_values: "Possible values"
-  :note_pass_none_to_disable_stemming: "pass 'none' to disable stemming"
-  :label_stem_strategy: "Stem strategy"
-  :option_stem_none: "Stem none (default)"
-  :option_stem_some: "Stem some"
-  :option_stem_all: "Stem all"
-  :label_stemming_description: "This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are"
-  :note_do_not_stem: "Don't perform any stemming."
-  :note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'."
-  :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)."
-  :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed."
-  :label_default_notifications: "File default notifications"
-  :heading_uploaded_files: "Uploaded Files"
-  :submit_commit: "Commit"
-  :link_documents: "Documents"
-  :permission_view_dmsf_folders: "Browse documents"
-  :permission_user_preferences: "User preferences"
-  :permission_view_dmsf_files: "View documents"
-  :permission_folder_manipulation: "Folder manipulation"
-  :permission_file_manipulation: "File manipulation"
-  :permission_file_approval: "File approval"
-  :permission_force_file_unlock: "Force file unlock"
-  :label_file: "File"
-  :field_folder: "Folder"
-  :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
-  :error_contains_invalid_character: "contains invalid character(s)"
-  :error_file_commit_require_uploaded_file: "File commit require uploaded file"
-  :warning_some_files_were_not_commited: "Some files were not commited due to validation errors: %{files}"
-  :error_user_has_not_right_delete_folder: "User hasn't right to delete forders"
-  :error_user_has_not_right_delete_file: "User hasn't right to delete file"
-  :notice_entries_deleted: "Entries deleted"
-  :warning_some_entries_were_not_deleted: "Some entries weren't deleted: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "Do you really want to delete checked entries?"
-  :title_delete_checked: "Delete checked"
-  :title_number_of_files_in_directory: "Number of files in directory"
-  :title_filename_for_download: "Filename used for download or in Zip archive"
-  :label_number_of_folders: "Folders"
-  :label_number_of_documents: "Documents"
-  :label_zip_names_encoding: "Zip names encoding"
-  :note_zip_names_encoding_iconv: "Iconv is used for charset conversion from utf-8 to target encoding"
-  :error_file_storage_directory_does_not_exist: "File storage directory doesn't exist and can't be created"
-  :error_file_can_not_be_created: "File can't be created in storage directory"
-  :error_wrong_zip_encoding: "Wrong Zip encoding"
-  :warning_xapian_not_available: "Xapian not available"
-  :menu_dmsf: "DMSF"
-  :label_physical_file_delete: "Physical file delete"
-  :user_is_not_project_member: "You are not member of the project"
-  :heading_access_downloads_emails: "Downloads/Emails"
-  :heading_access_first: "First"
-  :heading_access_last: "Last"
-  :label_dmsf_updated: "DMSF updated"
-  :title_total_size_of_all_files: "Total size of all files under this folder"
-  :project_module_dmsf: "DMSF"
-  :warning_no_project_to_copy_file_to: "No project to copy file to"
-  :comment_copied_from: "Copied from %{source}"
-  :notice_file_copied: "File copied"
-  :notice_file_moved: "File moved"
-  :label_target_project: "Target project"
-  :label_target_folder: "Target folder"
-  :title_copy_or_move: "Copy/Move"
-  :label_dmsf_folder_plural: "Dmsf folders"
-  :comment_moved_from: "Moved from %{source}"
-  :error_target_folder_same: "Target folder and project are the same as current"
-  :error_file_cannot_be_moved: "File can't be moved"
-  :error_file_cannot_be_copied: "File can't be copied"
-  :warning_no_project_to_copy_folder_to: "No project to copy folder to"
-  :title_copy: "Copy"
-  :error_folder_cannot_be_copied: "Folder can't be copied"
-  :notice_folder_copied: "Folder copied"
-  
-  :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
-  :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
-  :label_maximum_email_filesize: "Maximum email attachment size"
-  :header_minimum_filesize: "File Error."
-  :error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
-  :parent_directory: "Parent Directory"
-  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
-  :label_webdav: "Webdav functionality"
-  :label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
+  error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
+  note_maximum_email_filesize: Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB.
+  label_maximum_email_filesize: Maximum email attachment size
+  header_minimum_filesize: File Error.
+  error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
+  parent_directory: Parent Directory
+  note_webdav: Webdav once enabled can be found at http://.../dmsf/webdav/
+  label_webdav: Webdav functionality
+  label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
 
-  :warning_folder_already_locked: "This folder is already locked"
-  :notice_folder_locked: "The folder was successfully locked"
-  :warning_folder_not_locked: "Unfortunately, the folder could not be locked"
-  :notice_folder_unlocked: "The folder was successfully unlocked"
-  :error_only_user_that_locked_folder_can_unlock_it: "You are not authorised to unlock this folder"
-  :title_folder_parent_locked: "Parent folder %{name} is locked"
-  :title_file_parent_locked: "Parent folder %{name} is locked"
-  :title_unlock_folder: "Unlock to allow changes for other members"
-  :title_lock_folder: "Lock to prevent changes for other members"
+  warning_folder_already_locked: This folder is already locked
+  notice_folder_locked: The folder was successfully locked
+  warning_folder_not_locked: Unfortunately, the folder could not be locked
+  notice_folder_unlocked: The folder was successfully unlocked
+  error_only_user_that_locked_folder_can_unlock_it: You are not authorised to unlock this folder
+  title_folder_parent_locked: "Parent folder %{name} is locked"
+  title_file_parent_locked: "Parent folder %{name} is locked"
+  title_unlock_folder: Unlock to allow changes for other members
+  title_lock_folder: Lock to prevent changes for other members
 
-  :select_option_webdav_readonly: "Read-only"
-  :select_option_webdav_readwrite: "Read/Write"
-  :label_webdav_strategy: "Webdav strategy"
-  :note_webdav_strategy: "Enables the administrator to decide if webdav is a read-only or read-write platform for end users."
+  select_option_webdav_readonly: Read-only
+  select_option_webdav_readwrite: Read/Write
+  label_webdav_strategy: Webdav strategy
+  note_webdav_strategy: Enables the administrator to decide if webdav is a read-only or read-write platform for end users.  
+  
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
+  error_empty_note: "The note can't be empty"
+  error_workflow_assign: An error occured while assigning
+  error_cannot_start_workflow: "Workflow can't be started"
+  error_cannot_renumber_steps: "Steps can't be renumbered"
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
+  label_dmsf_workflow_step: Step
+  label_dmsf_workflow_step_plural: Steps
+  label_dmsf_workflow_approval: Approval
+  label_dmsf_workflow_approval_plural: Approvals
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Approve
+  label_dmsf_wokflow_action_reject: Reject
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
+  label_action: Action
+  label_note: Note  
+  title_none: None
+  title_rejection: Rejection
+  title_delegation: Delegation
+  title_assignment: Assignment
+  title_start: Start  
+  title_dmsf_workflow_log: Approval Workflow Log
+  title_assigned: Assigned
+  title_approval: Approval
+  title_rejected: Rejected
+  dmsf_and: AND
+  dmsf_or: OR
+  dmsf_new_step: New step  
+  message_dmsf_wokflow_note: Your note...
+  info_revision: "r%{rev}"
+  link_workflow: Workflow  
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index 27c81c21..90b42f9b 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -1,210 +1,246 @@
 # French translation for DMSF
 fr:
-  :dmsf: "DMSF"
-  :label_dmsf_file_plural: "Fichiers DMSF"
-  :warning_no_entries_selected: "Aucun fichier sélectionné"
-  :error_email_to_must_be_entered: "La saisie d'une adresse mail est obligatoire"
-  :notice_email_sent: "Mail envoyé"
-  :warning_file_already_locked: "Fichier déjà verrouillé"
-  :notice_file_locked: "Fichier verrouillé"
-  :warning_file_not_locked: "Fichier déverrouillé"
-  :notice_file_unlocked: "Fichier déverrouillé"
-  :error_only_user_that_locked_file_can_unlock_it: "Le fichier ne peut être déverrouillé que par celui qui l'a verrouillé"
-  :question_do_you_really_want_to_delete_this_entry: "Etes-vous sûr de vouloir supprimer cet élément ?"
-  :error_max_files_exceeded: "Le nombre de fichiers pouvant être téléchargés simultanément est dépassé"
-  :question_do_you_really_want_to_delete_this_revision: "Etes-vous sûr de vouloir supprimer cette révision ?"
-  :error_entry_project_does_not_match_current_project: "Entry project doesn't match current project"
-  :notice_folder_created: "Dossier créé"
-  :error_folder_creation_failed: "Erreur de création du dossier"
-  :error_folder_title_must_be_entered: "Le titre du document est requis"
-  :notice_folder_deleted: "Dossier supprimé"
-  :error_folder_is_not_empty: "Le dossier n'est pas vide"
-  :error_folder_title_is_already_used: "Le titre du fichier est déjà utilisé"
-  :notice_folder_details_were_saved: "Les détails du dossier ont été enregistrés"
-  :error_file_is_locked: "Le fichier est verrouillé"
-  :notice_file_deleted: "Le fichier a été supprimé"
-  :error_at_least_one_revision_must_be_present: "Au moins une révision est requise"
-  :notice_revision_deleted: "Révision supprimée"
-  :warning_one_of_files_locked: "Un des fichiers sélectionnés est verrouillé"
-  :notice_file_unlocked: "Fichier déverrouillé"
-  :notice_file_revision_created: "La révision du fichier a été ajoutée"
-  :notice_your_preferences_were_saved: "Vos paramètres ont été enregistrés"
-  :warning_folder_notifications_already_activated: "Les notifications du dossier sont déjà activées"
-  :notice_folder_notifications_activated: "Les notifications du dossier ont été activées"
-  :warning_folder_notifications_already_deactivated: "Les notifications du dossier sont déjà désactivées"
-  :notice_folder_notifications_deactivated: "Les notifications des dossier ont été désactivés"
-  :warning_file_notifications_already_activated: "Les notifications du fichier sont déjà désactivés"
-  :notice_file_notifications_activated: "Les notifications du fichier ont été activées"
-  :warning_file_notifications_already_deactivated: "Les notifications du fichier sont déjà désactivées"
-  :notice_file_notifications_deactivated: "Les notifications du fichier ont été désactivés"
-  :link_details: "Détails de %{title}"
-  :link_edit: "Modification du dossier %{title}"
-  :submit_create: "Ajouter"
-  :link_create_folder: "Créer un sous-dossier"
-  :title_check_uncheck_all_for_zip_download_or_email: "Sélectionner/Ignorer tous les documents pour le téléchargement ou pour la transmission par mail"
-  :link_title: "Titre"
-  :link_size: "Taille"
-  :link_modified: "Modifié"
-  :link_ver: "Version"
-  :link_author: "Auteur"
-  :title_check_for_zip_download_or_email: "Sélectionner pour le téléchargement ou la transmission par mail"
-  :title_delete: "Supprimer"
-  :title_notifications_active_deactivate: "Notifications activées : cliquer pour désactiver"
-  :title_notifications_not_active_activate: "Notifications désactivées : cliquer pour activer"
-  :title_title_version_version_download: "Télécharger la version %{version} de %{title}"
-  :title_locked_by_user: "Verrouillé par %{user}"
-  :title_locked_by_you: "Verrouillé par vous-même"
-  :title_waiting_for_approval: "Attente de validation"
-  :title_approved: "Validé"
-  :title_unlock_file: "Déverrouiller afin de permettre la modification par les membres du projet"
-  :title_lock_file: "Verrouiller afin d'empêcher les modifications du document"
-  :submit_download: "Télécharger"
-  :title_download_checked: "Télécharger les fichiers sélectionnés au format zip"
-  :submit_email: "Email"
-  :title_send_checked_by_email: "Transmettre les fichiers sélectionnés par mail"
-  :link_user_preferences: "Préférences personnelles du module DMSF"
-  :heading_send_documents_by_email: "Transmettre les documents par mail"
-  :label_email_from: "De"
-  :label_email_to: "A"
-  :label_email_cc: "Cc"
-  :label_email_subject: "Objet"
-  :label_email_documents: "Fichiers"
-  :label_email_body: "Message"
-  :label_email_send: "Envoyer"
-  :title_notifications_active: "Notifications actives"
-  :label_file_size: "Taille du fichier"
-  :heading_file_upload: "Déposer des fichiers"
-  :note_uploaded_maximum_files_at_once: "Seulement %{number} fichiers peuvent être déposés à la fois."
-  :note_upload_files_greater_than_two_gb: "Afin de transmettre des fichiers de plus de 2Go, l'utilisation d'un navigateur de 64Bits est nécessaire."
-  :submit_upload_files: "Transmission"
-  :heading_new_folder: "Nouveau Dossier"
-  :label_title: "Titre"
-  :label_description: "Description"
-  :submit_save: "Enregistrer"
-  :info_file_locked: "Fichier verrouillé"
-  :label_notifications: "Notifications"
-  :select_option_default: "Défaut"
-  :select_option_deactivated: "Désactivé"
-  :select_option_activated: "Activé"
-  :title_save_preferences: "Enregistrer les préférences"
-  :heading_revisions: "Révisions"
-  :title_download: "Télécharger"
-  :title_delete_revision: "Supprimer la révision"
-  :label_created: "Créé"
-  :label_changed: "Modifié"
-  :info_changed_by_user: "%{changed} par %{user}"
-  :label_filename: "Fichier"
-  :label_version: "Version"
-  :label_workflow: "Etat"
-  :option_workflow_waiting_for_approval: "En attente de validation"
-  :option_workflow_approved: "Validé"
-  :option_workflow_none: "Aucun"
-  :label_mime: "Type"
-  :label_size: "Taille"
-  :label_comment: "Commentaires"
-  :heading_new_revision: "Nouvelle révision"
-  :option_version_same: "(identique)"
-  :option_version_minor: "(modification mineure)"
-  :option_version_major: "(modification majeure)"
-  :label_new_content: "Nouvelle version du fichier"
-  :label_maximum_files_upload: "Nombre maximal de documents pouvant être transmis"
-  :note_maximum_number_of_files_uploaded: "Nombre maximal de documents pouvant être transmis en une fois. La valeur 0 signifie illimité."
-  :label_maximum_files_download: "Nombre maximal de fichiers pouvant être téléchargés"
-  :note_maximum_number_of_files_downloaded: "Nombre maximal de documents pouvant être téléchargés ou transmis par mail en une fois. La valeur 0 signifie illimité."
-  :label_file_storage_directory: "Dossier de stockage des documents"
-  :label_index_database: "Indexer la base de données"
-  :label_stemming_language: "Méthode de racinisation"
-  :note_possible_values: "valeurs possibles"
-  :note_pass_none_to_disable_stemming: "Utiliser 'none' pour désactiver la racinisation"
-  :label_stem_strategy: "Stratégie de racinisation"
-  :option_stem_none: "Aucun suffixe(défaut)"
-  :option_stem_some: "Quelques suffixes"
-  :option_stem_all: "Tous les suffixes"
-  :label_stemming_description: "Ce paramètre contrôle l'algorithme de racinisation appliqué par le requêteur. La valeur par défaut est STEM_NONE. Les paramètres disponibles sont"
-  :note_do_not_stem: "N'effectuer aucune transformation"
-  :note_stem_some: "Rechercher des stemmes pour tous les mots sauf ceux qui commencent par des majuscules, ceux suivis d'un certain nombre de caractères ou ceux utilisés avec des opérateurs nécessitant des informations contextuelles. Les stemmes doivent être préfixées par 'Z'."
-  :note_stem_all: "Rechercher toutes les racines de tous les mots (note : le préfix 'Z' ne sera pas ajouté)."
-  :note_stemming_applied: "Il est à noter que l'algorithme de racinisation ne sera appliqué qu'aux mots in probabilistic fields - Les filtres booléans ne seront pas racinisés."
-  :label_default_notifications: "Les notifications par défaut du document"
-  :heading_uploaded_files: "Document(s) transmis"
-  :submit_commit: "Appliquer"
-  :link_documents: "Documents"
-  :permission_view_dmsf_folders: "Parcourir les documents"
-  :permission_user_preferences: "Préférences utilisateur"
-  :permission_view_dmsf_files: "Afficher documents"
-  :permission_folder_manipulation: "Gestion des dossiers"
-  :permission_file_manipulation: "Gestion des documents"
-  :permission_file_approval: "Validation du document"
-  :permission_force_file_unlock: "Forcer le déverrouillage du document"
-  :label_file: "Fichier"
-  :field_folder: "Dossier"
-  :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
-  :error_contains_invalid_character: "Contient de(s) caractère(s) invalide(s)"
-  :error_file_commit_require_uploaded_file: "Transmission des fichiers nécessaire avant l'enregistrement"
-  :warning_some_files_were_not_commited: "Erreur d'enregsitrement de certains fichiers %{files}"
-  :error_user_has_not_right_delete_folder: "L'utilisateur ne dispose pas des droits nécessaires permettant la suppression du dossier"
-  :error_user_has_not_right_delete_file: "L'utilisateur ne dispose pas des droits nécessaires permettant la suppression du dossier"
-  :notice_entries_deleted: "Elément(s) supprimé(s)"
-  :warning_some_entries_were_not_deleted: "Certains éléments n'ont pas été supprimés : %{entries}"
-  :question_do_you_really_want_to_delete_entries: "Etes-vous sûr de vouloir supprimer le(s) élément(s) sélectionné(s)?"
-  :title_delete_checked: "Supprimer les éléments sélectionnés"
-  :title_number_of_files_in_directory: "Nombre de fichiers dans le dossier"
-  :title_filename_for_download: "Nom du fichier à utiliser lors du téléchargement ou de l'archive ZIP"
-  :label_number_of_folders: "Dossiers"
-  :label_number_of_documents: "Fichiers"
-  :label_zip_names_encoding: "Encodage du nom des fichiers ZIP"
-  :note_zip_names_encoding_iconv: "Iconv est utilisé lors de la transformation du jeu de caractères utf-8 vers le jeu de caractères cible"
-  :error_file_storage_directory_does_not_exist: "Le répertoire de stockage des fichiers n'existe pas ou n'a pas pu être créé"
-  :error_file_can_not_be_created: "Le fichier n'a pas pu être enregistré dans le répertoire de stockage"
-  :error_wrong_zip_encoding: "Mauvais jeu de caractères pour la transformation du nom du ZIP"
-  :warning_xapian_not_available: "Le module Xapian est indisponible"
-  :menu_dmsf: "DMSF"
-  :label_physical_file_delete: "Suppression des fichiers"
-  :user_is_not_project_member: "Vous n'êtes pas un membre du projet"
-  :heading_access_downloads_emails: "Téléchargement / Envoi par mail"
-  :heading_access_first: "Premier"
-  :heading_access_last: "Dernier"
-  :label_dmsf_updated: "Dépôt ou mise à jour du document "
-  :title_total_size_of_all_files: "Taille totale des fichiers de ce dossier"
-  :project_module_dmsf: "DMSF"
-  :warning_no_project_to_copy_file_to: "Le projet de destination n'est pas défini"
-  :comment_copied_from: "Copie effectuée depuis %{source}"
-  :notice_file_copied: "Fichier copié"
-  :notice_file_moved: "Fichier déplacé"
-  :label_target_project: "Projet cible"
-  :label_target_folder: "Dossier cible"
-  :title_copy_or_move: "Copie/Déplacement"
-  :label_dmsf_folder_plural: "Les dossiers de DMSF"
-  :comment_moved_from: "Déplacé depuis %{source}"
-  :error_target_folder_same: "Le projet et le dossier cible sont identiques au projet et dossier source"
-  :error_file_cannot_be_moved: "Le fichier ne peut pas être déplacé"
-  :error_file_cannot_be_copied: "Le fichier ne peut pas être copié"
-  :warning_no_project_to_copy_folder_to: "Le projet de destination n'est pas défini"
-  :title_copy: "Copie"
-  :error_folder_cannot_be_copied: "Le dossier ne peut pas être copié"
-  :notice_folder_copied: "Dossier copié"
+  dmsf: DMSF
+  label_dmsf_file_plural: Fichiers DMSF
+  warning_no_entries_selected: Aucun fichier sélectionné
+  error_email_to_must_be_entered: La saisie d'une adresse mail est obligatoire
+  notice_email_sent: Mail envoyé
+  warning_file_already_locked: Fichier déjà verrouillé
+  notice_file_locked: Fichier verrouillé
+  warning_file_not_locked: Fichier déverrouillé
+  notice_file_unlocked: Fichier déverrouillé
+  error_only_user_that_locked_file_can_unlock_it: "Le fichier ne peut être déverrouillé que par celui qui l'a verrouillé"
+  question_do_you_really_want_to_delete_this_entry: Etes-vous sûr de vouloir supprimer cet élément ?
+  error_max_files_exceeded: Le nombre de fichiers pouvant être téléchargés simultanément est dépassé
+  question_do_you_really_want_to_delete_this_revision: Etes-vous sûr de vouloir supprimer cette révision ?
+  error_entry_project_does_not_match_current_project: Entry project doesn't match current project
+  notice_folder_created: Dossier créé
+  error_folder_creation_failed: Erreur de création du dossier
+  error_folder_title_must_be_entered: Le titre du document est requis
+  notice_folder_deleted: Dossier supprimé
+  error_folder_is_not_empty: "Le dossier n'est pas vide"
+  error_folder_title_is_already_used: Le titre du fichier est déjà utilisé
+  notice_folder_details_were_saved: Les détails du dossier ont été enregistrés
+  error_file_is_locked: Le fichier est verrouillé
+  notice_file_deleted: Le fichier a été supprimé
+  error_at_least_one_revision_must_be_present: Au moins une révision est requise
+  notice_revision_deleted: Révision supprimée
+  warning_one_of_files_locked: Un des fichiers sélectionnés est verrouillé
+  notice_file_unlocked: Fichier déverrouillé
+  notice_file_revision_created: La révision du fichier a été ajoutée
+  notice_your_preferences_were_saved: Vos paramètres ont été enregistrés
+  warning_folder_notifications_already_activated: Les notifications du dossier sont déjà activées
+  notice_folder_notifications_activated: Les notifications du dossier ont été activées
+  warning_folder_notifications_already_deactivated: Les notifications du dossier sont déjà désactivées
+  notice_folder_notifications_deactivated: Les notifications des dossier ont été désactivés
+  warning_file_notifications_already_activated: Les notifications du fichier sont déjà désactivés
+  notice_file_notifications_activated: Les notifications du fichier ont été activées
+  warning_file_notifications_already_deactivated: Les notifications du fichier sont déjà désactivées
+  notice_file_notifications_deactivated: Les notifications du fichier ont été désactivés
+  link_details: "Détails de %{title}"
+  link_edit: "Modification du dossier %{title}"
+  submit_create: Ajouter
+  link_create_folder: Créer un sous-dossier
+  title_check_uncheck_all_for_zip_download_or_email: Sélectionner/Ignorer tous les documents pour le téléchargement ou pour la transmission par mail
+  link_title: Titre
+  link_size: Taille
+  link_modified: Modifié
+  link_ver: Version
+  link_author: Auteur
+  title_check_for_zip_download_or_email: Sélectionner pour le téléchargement ou la transmission par mail
+  title_delete: Supprimer
+  title_notifications_active_deactivate: "Notifications activées : cliquer pour désactiver"
+  title_notifications_not_active_activate: "Notifications désactivées : cliquer pour activer"
+  title_title_version_version_download: "Télécharger la version %{version} de %{title}"
+  title_locked_by_user: "Verrouillé par %{user}"
+  title_locked_by_you: Verrouillé par vous-même
+  title_waiting_for_approval: Attente de validation
+  title_approved: Validé
+  title_unlock_file: Déverrouiller afin de permettre la modification par les membres du projet
+  title_lock_file: Verrouiller afin d'empêcher les modifications du document
+  submit_download: Télécharger
+  title_download_checked: Télécharger les fichiers sélectionnés au format zip
+  submit_email: Email
+  title_send_checked_by_email: Transmettre les fichiers sélectionnés par mail
+  link_user_preferences: Préférences personnelles du module DMSF
+  heading_send_documents_by_email: Transmettre les documents par mail
+  label_email_from: De
+  label_email_to: A
+  label_email_cc: Cc
+  label_email_subject: Objet
+  label_email_documents: Fichiers
+  label_email_body: Message
+  label_email_send: Envoyer
+  title_notifications_active: Notifications actives
+  label_file_size: Taille du fichier
+  heading_file_upload: Déposer des fichiers
+  note_uploaded_maximum_files_at_once: "Seulement %{number} fichiers peuvent être déposés à la fois."
+  note_upload_files_greater_than_two_gb: Afin de transmettre des fichiers de plus de 2Go, l'utilisation d'un navigateur de 64Bits est nécessaire.
+  submit_upload_files: Transmission
+  heading_new_folder: Nouveau Dossier
+  label_title: Titre
+  label_description: Description
+  submit_save: Enregistrer
+  info_file_locked: Fichier verrouillé
+  label_notifications: Notifications
+  select_option_default: Défaut
+  select_option_deactivated: Désactivé
+  select_option_activated: Activé
+  title_save_preferences: Enregistrer les préférences
+  heading_revisions: Révisions
+  title_download: Télécharger
+  title_delete_revision: Supprimer la révision
+  label_created: Créé
+  label_changed: Modifié
+  info_changed_by_user: "%{changed} par %{user}"
+  label_filename: Fichier
+  label_version: Version
+  label_workflow: Etat
+  label_mime: Type
+  label_size: Taille
+  label_comment: Commentaires
+  heading_new_revision: Nouvelle révision
+  option_version_same: (identique)
+  option_version_minor: (modification mineure)
+  option_version_major: (modification majeure)
+  label_new_content: Nouvelle version du fichier
+  label_maximum_files_upload: Nombre maximal de documents pouvant être transmis
+  note_maximum_number_of_files_uploaded: Nombre maximal de documents pouvant être transmis en une fois. La valeur 0 signifie illimité.
+  label_maximum_files_download: Nombre maximal de fichiers pouvant être téléchargés
+  note_maximum_number_of_files_downloaded: Nombre maximal de documents pouvant être téléchargés ou transmis par mail en une fois. La valeur 0 signifie illimité.
+  label_file_storage_directory: Dossier de stockage des documents
+  label_index_database: Indexer la base de données
+  label_stemming_language: Méthode de racinisation
+  note_possible_values: valeurs possibles
+  note_pass_none_to_disable_stemming: "Utiliser 'none' pour désactiver la racinisation"
+  label_stem_strategy: Stratégie de racinisation
+  option_stem_none: Aucun suffixe(défaut)
+  option_stem_some: Quelques suffixes
+  option_stem_all: Tous les suffixes
+  label_stemming_description: Ce paramètre contrôle l'algorithme de racinisation appliqué par le requêteur. La valeur par défaut est STEM_NONE. Les paramètres disponibles sont
+  note_do_not_stem: "N'effectuer aucune transformation"
+  note_stem_some: "Rechercher des stemmes pour tous les mots sauf ceux qui commencent par des majuscules, ceux suivis d'un certain nombre de caractères ou ceux utilisés avec des opérateurs nécessitant des informations contextuelles. Les stemmes doivent être préfixées par 'Z'."
+  note_stem_all: "Rechercher toutes les racines de tous les mots (note : le préfix 'Z' ne sera pas ajouté)."
+  note_stemming_applied: Il est à noter que l'algorithme de racinisation ne sera appliqué qu'aux mots in probabilistic fields - Les filtres booléans ne seront pas racinisés.
+  label_default_notifications: Les notifications par défaut du document
+  heading_uploaded_files: Document(s) transmis
+  submit_commit: Appliquer
+  link_documents: Documents
+  permission_view_dmsf_folders: Parcourir les documents
+  permission_user_preferences: Préférences utilisateur
+  permission_view_dmsf_files: Afficher documents
+  permission_folder_manipulation: Gestion des dossiers
+  permission_file_manipulation: Gestion des documents
+  permission_file_approval: Validation du document
+  permission_force_file_unlock: Forcer le déverrouillage du document
+  label_file: Fichier
+  field_folder: Dossier
+  error_create_cycle_in_folder_dependency: create cycle in folder dependency
+  error_contains_invalid_character: Contient de(s) caractère(s) invalide(s)
+  error_file_commit_require_uploaded_file: "Transmission des fichiers nécessaire avant l'enregistrement"
+  warning_some_files_were_not_commited: "Erreur d'enregsitrement de certains fichiers %{files}"
+  error_user_has_not_right_delete_folder: "L'utilisateur ne dispose pas des droits nécessaires permettant la suppression du dossier"
+  error_user_has_not_right_delete_file: "L'utilisateur ne dispose pas des droits nécessaires permettant la suppression du dossier"
+  notice_entries_deleted: Elément(s) supprimé(s)
+  warning_some_entries_were_not_deleted: "Certains éléments n'ont pas été supprimés : %{entries}"
+  question_do_you_really_want_to_delete_entries: Etes-vous sûr de vouloir supprimer le(s) élément(s) sélectionné(s)?
+  title_delete_checked: Supprimer les éléments sélectionnés
+  title_number_of_files_in_directory: Nombre de fichiers dans le dossier
+  title_filename_for_download: "Nom du fichier à utiliser lors du téléchargement ou de l'archive ZIP"
+  label_number_of_folders: Dossiers
+  label_number_of_documents: Fichiers
+  label_zip_names_encoding: Encodage du nom des fichiers ZIP
+  note_zip_names_encoding_iconv: Iconv est utilisé lors de la transformation du jeu de caractères utf-8 vers le jeu de caractères cible
+  error_file_storage_directory_does_not_exist: Le répertoire de stockage des fichiers n'existe pas ou n'a pas pu être créé
+  error_file_can_not_be_created: "Le fichier n'a pas pu être enregistré dans le répertoire de stockage"
+  error_wrong_zip_encoding: Mauvais jeu de caractères pour la transformation du nom du ZIP
+  warning_xapian_not_available: Le module Xapian est indisponible
+  menu_dmsf: DMSF
+  label_physical_file_delete: Suppression des fichiers
+  user_is_not_project_member: "Vous n'êtes pas un membre du projet"
+  heading_access_downloads_emails: Téléchargement / Envoi par mail
+  heading_access_first: Premier
+  heading_access_last: Dernier
+  label_dmsf_updated: Dépôt ou mise à jour du document
+  title_total_size_of_all_files: Taille totale des fichiers de ce dossier
+  project_module_dmsf: DMSF
+  warning_no_project_to_copy_file_to: "Le projet de destination n'est pas défini"
+  comment_copied_from: "Copie effectuée depuis %{source}"
+  notice_file_copied: Fichier copié
+  notice_file_moved: Fichier déplacé
+  label_target_project: Projet cible
+  label_target_folder: Dossier cible
+  title_copy_or_move: Copie/Déplacement
+  label_dmsf_folder_plural: Les dossiers de DMSF
+  comment_moved_from: "Déplacé depuis %{source}"
+  error_target_folder_same: Le projet et le dossier cible sont identiques au projet et dossier source
+  error_file_cannot_be_moved: Le fichier ne peut pas être déplacé
+  error_file_cannot_be_copied: Le fichier ne peut pas être copié
+  warning_no_project_to_copy_folder_to: "Le projet de destination n'est pas défini"
+  title_copy: Copie
+  error_folder_cannot_be_copied: Le dossier ne peut pas être copié
+  notice_folder_copied: Dossier copié
   
-  :error_max_email_filesize_exceeded: "Vous avez dépassé la taille maximale des fichiers pouvant être transmis par mail (%{number} MB)"
-  :note_maximum_email_filesize: "Taille maximale, en méga octets, des fichiers pouvant être transmis par mail. 0 indique aucune restriction"
-  :label_maximum_email_filesize: "Taille maximale du fichier attaché"
-  :header_minimum_filesize: "Erreur de fichier."
-  :error_minimum_filesize: "Le fichier %{file} est vide. Il ne sera pas transmis."
-  :parent_directory: "Dossier parent"
-  :note_webdav: "Après l'activation du module Webdav, celui-ci sera accessible par http://.../dmsf/webdav/"
-  :label_webdav: "Module Webdav"
-  :label_dmsf_plural: "Copier les fichiers et les dossiers DMSF (%{files} fichiers dans %{folders} dossiers)"
+  error_max_email_filesize_exceeded: "Vous avez dépassé la taille maximale des fichiers pouvant être transmis par mail (%{number} MB)"
+  note_maximum_email_filesize: Taille maximale, en méga octets, des fichiers pouvant être transmis par mail. 0 indique aucune restriction
+  label_maximum_email_filesize: Taille maximale du fichier attaché
+  header_minimum_filesize: Erreur de fichier.
+  error_minimum_filesize: "Le fichier %{file} est vide. Il ne sera pas transmis."
+  parent_directory: Dossier parent
+  note_webdav: "Après l'activation du module Webdav, celui-ci sera accessible par http://.../dmsf/webdav/"
+  label_webdav: Module Webdav
+  label_dmsf_plural: "Copier les fichiers et les dossiers DMSF (%{files} fichiers dans %{folders} dossiers)"
 
-  :warning_folder_already_locked: "Ce dossier est déjà verrouillé"
-  :notice_folder_locked: "Dossier verrouillé"
-  :warning_folder_not_locked: "Echec du verrouillage du dossier"
-  :notice_folder_unlocked: "Le dossier a été déverrouillé"
-  :error_only_user_that_locked_folder_can_unlock_it: "Vous n'êtes autorisé à déverrouiller ce dossier"
-  :title_folder_parent_locked: "Le dossier parent %{name} verrouillé"
-  :title_file_parent_locked: "Le dossier parent %{name} verrouillé"
-  :title_unlock_folder: "Déverrouiller afin de permettre la modification par les membres du projet"
-  :title_lock_folder: "Verrouiller afin d'empêcher les modifications du dossier"
-
-  :select_option_webdav_readonly: "Lecture"
-  :select_option_webdav_readwrite: "Lecture/Ecriture"
-  :label_webdav_strategy: "Accès Webdav"
-  :note_webdav_strategy: "Permet à l'administrateur d'autoriser les utilisateurs au module Webdav en letcure seule ou en lecture et écriture."
+  warning_folder_already_locked: Ce dossier est déjà verrouillé
+  notice_folder_locked: Dossier verrouillé
+  warning_folder_not_locked: Echec du verrouillage du dossier
+  notice_folder_unlocked: Le dossier a été déverrouillé
+  error_only_user_that_locked_folder_can_unlock_it: "Vous n'êtes autorisé à déverrouiller ce dossier"
+  title_folder_parent_locked: "Le dossier parent %{name} verrouillé"
+  title_file_parent_locked: "Le dossier parent %{name} verrouillé"
+  title_unlock_folder: Déverrouiller afin de permettre la modification par les membres du projet
+  title_lock_folder: "Verrouiller afin d'empêcher les modifications du dossier"
+  
+  select_option_webdav_readonly: Lecture
+  select_option_webdav_readwrite: Lecture/Ecriture
+  label_webdav_strategy: Accès Webdav
+  note_webdav_strategy: "Permet à l'administrateur d'autoriser les utilisateurs au module Webdav en letcure seule ou en lecture et écriture."
+  
+  # Not translated
+  
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
+  error_empty_note: The note can't be empty
+  error_workflow_assign: An error occured while assigning
+  error_cannot_start_workflow: Workflow can't be started
+  error_cannot_renumber_steps: Steps can't be renumbered
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
+  label_dmsf_workflow_step: Step
+  label_dmsf_workflow_step_plural: Steps
+  label_dmsf_workflow_approval: Approval
+  label_dmsf_workflow_approval_plural: Approvals
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Approve
+  label_dmsf_wokflow_action_reject: Reject
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
+  label_action: Action
+  label_note: Note  
+  title_none: None
+  title_rejection: Rejection
+  title_delegation: Delegation
+  title_assignment: Assignment
+  title_start: Start  
+  title_dmsf_workflow_log: Approval Workflow Log
+  title_assigned: Assigned
+  title_approval: Approval
+  title_rejected: Rejected
+  dmsf_and: AND
+  dmsf_or: OR
+  dmsf_new_step: New step  
+  message_dmsf_wokflow_note: Your note...
+  info_revision: "r%{rev}"
+  link_workflow: Workflow  
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 8e69e1b4..b64dcf83 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -1,212 +1,246 @@
 # Japanese translation for DMSF
 ja:
-  :dmsf: "DMSF"
-  :label_dmsf_file_plural: "Dmsf ファイル"
-  :warning_no_entries_selected: "エントリーが選ばれていません"
-  :error_email_to_must_be_entered: "電子メールの To 先は省略できません"
-  :notice_email_sent: "電子メールを送信しました"
-  :warning_file_already_locked: "ファイルは既にロックされています"
-  :notice_file_locked: "ファイルをロックしました"
-  :warning_file_not_locked: "ファイルはロックされていません"
-  :notice_file_unlocked: "ファイルをロック解除しました"
-  :error_only_user_that_locked_file_can_unlock_it: "ファイルをロックしたユーザだけがロック解除できます"
-  :question_do_you_really_want_to_delete_this_entry: "本当にこのエントリーを削除しますか？"
-  :error_max_files_exceeded: "同時にダウンロードできるファイル数の上限 %{number} を超えています"
-  :question_do_you_really_want_to_delete_this_revision: "本当にこのリビジョンを削除しますか？"
-  :error_entry_project_does_not_match_current_project: "指定したプロジェクトは現在のプロジェクトと一致しません"
-  :notice_folder_created: "フォルダを作成しました"
-  :error_folder_creation_failed: "フォルダを作成できません"
-  :error_folder_title_must_be_entered: "タイトルが必要です"
-  :notice_folder_deleted: "フォルダを削除しました"
-  :error_folder_is_not_empty: "フォルダが空ではありません"
-  :error_folder_title_is_already_used: "タイトルは既に使われています"
-  :notice_folder_details_were_saved: "フォルダの詳細を保存しました"
-  :error_file_is_locked: "ファイルはロックされています"
-  :notice_file_deleted: "ファイルを削除しました"
-  :error_at_least_one_revision_must_be_present: "少なくとも１つのリビジョンが必要です"
-  :notice_revision_deleted: "リビジョンを削除しました"
-  :warning_one_of_files_locked: "ファイルのうちの１つがロックされています"
-  :notice_file_unlocked: "ファイルをロック解除しました"
-  :notice_file_revision_created: "ファイルのリビジョンを作成しました"
-  :notice_your_preferences_were_saved: "あなたの設定を保存しました"
-  :warning_folder_notifications_already_activated: "フォルダ通知は既に有効です"
-  :notice_folder_notifications_activated: "フォルダ通知を有効にしました"
-  :warning_folder_notifications_already_deactivated: "フォルダ通知は既に無効です"
-  :notice_folder_notifications_deactivated: "フォルダ通知を無効にしました"
-  :warning_file_notifications_already_activated: "ファイル通知は既に有効です"
-  :notice_file_notifications_activated: "ファイル通知を有効にしました"
-  :warning_file_notifications_already_deactivated: "ファイル通知は既に無効です"
-  :notice_file_notifications_deactivated: "ファイル通知を無効にしました"
-  :link_details: "%{title} の詳細を表示します"
-  :link_edit: "%{title} を編集します"
-  :submit_create: "作成"
-  :link_create_folder: "フォルダを作成します"
-  :title_check_uncheck_all_for_zip_download_or_email: "すべての Zip ダウンロードまたは電子メールのチェックをオン/オフします"
-  :link_title: "タイトル"
-  :link_size: "サイズ"
-  :link_modified: "更新日時"
-  :link_ver: "バージョン"
-  :link_author: "作成者"
-  :title_check_for_zip_download_or_email: "Zip ダウンロードまたは電子メールをチェックします"
-  :title_delete: "削除します"
-  :title_notifications_active_deactivate: "通知は有効です: 無効にする"
-  :title_notifications_not_active_activate: "通知は無効です: 有効にする"
-  :title_title_version_version_download: "%{title} のバージョン %{version} をダウンロードします"
-  :title_locked_by_user: "%{user} によってロックされています"
-  :title_locked_by_you: "あなたがロックしています"
-  :title_waiting_for_approval: "承認待ち"
-  :title_approved: "承認済み"
-  :title_unlock_file: "ロック解除して他のメンバーの変更を許可します"
-  :title_lock_file: "ロックして他のメンバーの変更を禁止します"
-  :submit_download: "ダウンロード"
-  :title_download_checked: "チェックしたものを Zip アーカイブでダウンロードします"
-  :submit_email: "電子メール"
-  :title_send_checked_by_email: "チェックしたものを電子メールで送信します"
-  :link_user_preferences: "あなたの DMSF プロジェクト設定"
-  :heading_send_documents_by_email: "電子メールによる文書の送信"
-  :label_email_from: "From"
-  :label_email_to: "To"
-  :label_email_cc: "CC"
-  :label_email_subject: "表題"
-  :label_email_documents: "文書"
-  :label_email_body: "本文"
-  :label_email_send: "送信"
-  :title_notifications_active: "通知は有効です"
-  :label_file_size: "ファイルサイズ"
-  :heading_file_upload: "アップロード"
-  :note_uploaded_maximum_files_at_once: "最大 %{number} ファイルを一度にアップロードすることができます。"
-  :note_upload_files_greater_than_two_gb: "2GB より大きいファイルをアップロードするには 64bit 対応ブラウザが必要です。"
-  :submit_upload_files: "アップロード"
-  :heading_new_folder: "新規フォルダ"
-  :label_title: "タイトル"
-  :label_description: "説明"
-  :submit_save: "保存"
-  :info_file_locked: "ファイルをロックしました！"
-  :label_notifications: "通知"
-  :select_option_default: "既定値"
-  :select_option_deactivated: "無効"
-  :select_option_activated: "有効"
-  :title_save_preferences: "設定を保存します"
-  :heading_revisions: "リビジョン"
-  :title_download: "ダウンロードします"
-  :title_delete_revision: "リビジョンを削除します"
-  :label_created: "作成者/日時"
-  :label_changed: "更新者/日時"
-  :info_changed_by_user: "%{user} / %{changed}"
-  :label_filename: "ファイル名"
-  :label_version: "バージョン"
-  :label_workflow: "ワークフロー"
-  :option_workflow_waiting_for_approval: "承認待ち"
-  :option_workflow_approved: "承認済み"
-  :option_workflow_none: "なし"
-  :label_mime: "Mime"
-  :label_size: "サイズ"
-  :label_comment: "コメント"
-  :heading_new_revision: "新しいリビジョン"
-  :option_version_same: "変更なし"
-  :option_version_minor: "マイナー"
-  :option_version_major: "メジャー"
-  :label_new_content: "新規コンテンツ"
-  :label_maximum_files_upload: "最大ファイルアップロード数"
-  :note_maximum_number_of_files_uploaded: "一度にアップロードできるファイル数の上限。0は無制限。"
-  :label_maximum_files_download: "最大ファイルダウンロード数"
-  :note_maximum_number_of_files_downloaded: "Zip でダウンロードできる、または電子メールで送られるファイル数の上限。0は無制限。"
-  :label_file_storage_directory: "ファイル保存フォルダ"
-  :label_index_database: "インデックスデータベース"
-  :label_stemming_language: "語幹抽出する言語"
-  :note_possible_values: "取りうる値"
-  :note_pass_none_to_disable_stemming: "語幹抽出を無効にするには 'none' を設定します。"
-  :label_stem_strategy: "抽出方針"
-  :option_stem_none: "Stem none (既定値)"
-  :option_stem_some: "Stem some"
-  :option_stem_all: "Stem all"
-  :label_stemming_description: "クエリ解釈ルーチンがどのように語幹抽出アルゴリズムを適用するかを制御します。既定値は、STEM_NONE です。設定可能な値は次のものです。"
-  :note_do_not_stem: "語幹抽出しません。"
-  :note_stem_some: "大文字から始まる、特定の文字の後に続く、あるいは位置情報を必要とするオペレーターと共に使われる語を除くそれ以外の語の語幹を検索します。語幹抽出された語は、先頭に 'Z' が付きます。"
-  :note_stem_all: "すべての語の語幹を検索します。(注: 先頭に 'Z' は付きません。)"
-  :note_stemming_applied: "語幹抽出アルゴリズムは、確率を測る対象の位置にある語にしか適用できない (論理演算子の用語自体は語幹抽出されない) ことにご注意ください。"
-  :label_default_notifications: "ファイル通知の既定値"
-  :heading_uploaded_files: "アップロードされたファイル"
-  :submit_commit: "コミット"
-  :link_documents: "文書"
-  :permission_view_dmsf_folders: "文書の一覧"
-  :permission_user_preferences: "ユーザ設定"
-  :permission_view_dmsf_files: "文書の表示"
-  :permission_folder_manipulation: "フォルダの操作"
-  :permission_file_manipulation: "ファイルの操作"
-  :permission_file_approval: "ファイルの承認"
-  :permission_force_file_unlock: "ファイルの強制ロック解除"
-  :label_file: "ファイル"
-  :field_folder: "フォルダ"
-  :error_create_cycle_in_folder_dependency: "フォルダの依存関係が循環しています"
-  :error_contains_invalid_character: "無効な文字を含んでいます"
-  :error_file_commit_require_uploaded_file: "コミットするには、まずファイルをアップロードしてください"
-  :warning_some_files_were_not_commited: "いくつかのファイルは、バリデーションエラーのためにコミットされませんでした: %{files}"
-  :error_user_has_not_right_delete_folder: "ユーザにフォルダを削除する権限がありません"
-  :error_user_has_not_right_delete_file: "ユーザにファイルを削除する権限がありません"
-  :notice_entries_deleted: "エントリーを削除しました"
-  :warning_some_entries_were_not_deleted: "いくつかのエントリーは削除されませんでした: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "本当にチェックしたエントリーを削除しますか？"
-  :title_delete_checked: "チェックしたものを削除します"
-  :title_number_of_files_in_directory: "フォルダ内のファイル数"
-  :title_filename_for_download: "ファイル名はダウンロードまたは Zip アーカイブに使われます"
-  :label_number_of_folders: "フォルダ"
-  :label_number_of_documents: "文書"
-  :label_zip_names_encoding: "Zip 名のエンコード"
-  :note_zip_names_encoding_iconv: "文字コードを utf-8 から目的のエンコードに変換するのに Iconv が使われています"
-  :error_file_storage_directory_does_not_exist: "ファイル保存フォルダが存在せず作ることもできません"
-  :error_file_can_not_be_created: "ファイルを保存フォルダに作ることができません"
-  :error_wrong_zip_encoding: "Zip エンコーディングが正しくありません"
-  :warning_xapian_not_available: "Xapian が利用できる状態になっていません"
-  :menu_dmsf: "DMSF"
-  :label_physical_file_delete: "物理ファイルの削除"
-  :user_is_not_project_member: "あなたはプロジェクトのメンバーではありません"
-  :heading_access_downloads_emails: "ダウンロード/電子メール"
-  :heading_access_first: "初回アクセス"
-  :heading_access_last: "最終アクセス"
-  :label_dmsf_updated: "DMSF updated"
-  :title_total_size_of_all_files: "このフォルダにある全ファイルの合計サイズ"
-  :project_module_dmsf: "DMSF"
-  :warning_no_project_to_copy_file_to: "ファイルをコピーするプロジェクトがありません"
-  :comment_copied_from: "%{source} からコピーしました"
-  :notice_file_copied: "ファイルをコピーしました"
-  :notice_file_moved: "ファイルを移動しました"
-  :label_target_project: "ターゲットプロジェクト"
-  :label_target_folder: "ターゲットフォルダ"
-  :title_copy_or_move: "コピー/移動"
-  :label_dmsf_folder_plural: "Dmsf フォルダ"  
-  :comment_moved_from: "%{source} から移動しました"
-  :error_target_folder_same: "コピー/移動先のフォルダとプロジェクトが現在と同じです"
-  :error_file_cannot_be_moved: "ファイルを移動できません"
-  :error_file_cannot_be_copied: "ファイルをコピーできません"
-  :warning_no_project_to_copy_folder_to: "フォルダをコピーするプロジェクトがありません"
-  :title_copy: "コピー"
-  :error_folder_cannot_be_copied: "フォルダをコピーできません"
-  :notice_folder_copied: "フォルダをコピーしました"
+  dmsf: DMSF
+  label_dmsf_file_plural: Dmsf ファイル
+  warning_no_entries_selected: エントリーが選ばれていません
+  error_email_to_must_be_entered: 電子メールの To 先は省略できません
+  notice_email_sent: 電子メールを送信しました
+  warning_file_already_locked: ファイルは既にロックされています
+  notice_file_locked: ファイルをロックしました
+  warning_file_not_locked: ファイルはロックされていません
+  notice_file_unlocked: ファイルをロック解除しました
+  error_only_user_that_locked_file_can_unlock_it: ファイルをロックしたユーザだけがロック解除できます
+  question_do_you_really_want_to_delete_this_entry: 本当にこのエントリーを削除しますか？
+  error_max_files_exceeded: "同時にダウンロードできるファイル数の上限 %{number} を超えています"
+  question_do_you_really_want_to_delete_this_revision: 本当にこのリビジョンを削除しますか？
+  error_entry_project_does_not_match_current_project: 指定したプロジェクトは現在のプロジェクトと一致しません
+  notice_folder_created: フォルダを作成しました
+  error_folder_creation_failed: フォルダを作成できません
+  error_folder_title_must_be_entered: タイトルが必要です
+  notice_folder_deleted: フォルダを削除しました
+  error_folder_is_not_empty: フォルダが空ではありません
+  error_folder_title_is_already_used: タイトルは既に使われています
+  notice_folder_details_were_saved: フォルダの詳細を保存しました
+  error_file_is_locked: ファイルはロックされています
+  notice_file_deleted: ファイルを削除しました
+  error_at_least_one_revision_must_be_present: 少なくとも１つのリビジョンが必要です
+  notice_revision_deleted: リビジョンを削除しました
+  warning_one_of_files_locked: ファイルのうちの１つがロックされています
+  notice_file_unlocked: ファイルをロック解除しました
+  notice_file_revision_created: ファイルのリビジョンを作成しました
+  notice_your_preferences_were_saved: あなたの設定を保存しました
+  warning_folder_notifications_already_activated: フォルダ通知は既に有効です
+  notice_folder_notifications_activated: フォルダ通知を有効にしました
+  warning_folder_notifications_already_deactivated: フォルダ通知は既に無効です
+  notice_folder_notifications_deactivated: フォルダ通知を無効にしました
+  warning_file_notifications_already_activated: ファイル通知は既に有効です
+  notice_file_notifications_activated: ファイル通知を有効にしました
+  warning_file_notifications_already_deactivated: ファイル通知は既に無効です
+  notice_file_notifications_deactivated: ファイル通知を無効にしました
+  link_details: "%{title} の詳細を表示します"
+  link_edit: "%{title} を編集します"
+  submit_create: 作成
+  link_create_folder: フォルダを作成します
+  title_check_uncheck_all_for_zip_download_or_email: すべての Zip ダウンロードまたは電子メールのチェックをオン/オフします
+  link_title: タイトル
+  link_size: サイズ
+  link_modified: 更新日時
+  link_ver: バージョン
+  link_author: 作成者
+  title_check_for_zip_download_or_email: Zip ダウンロードまたは電子メールをチェックします
+  title_delete: 削除します
+  title_notifications_active_deactivate: "通知は有効です: 無効にする"
+  title_notifications_not_active_activate: "通知は無効です: 有効にする"
+  title_title_version_version_download: "%{title} のバージョン %{version} をダウンロードします"
+  title_locked_by_user: "%{user} によってロックされています"
+  title_locked_by_you: あなたがロックしています
+  title_waiting_for_approval: 承認待ち
+  title_approved: 承認済み
+  title_unlock_file: ロック解除して他のメンバーの変更を許可します
+  title_lock_file: ロックして他のメンバーの変更を禁止します
+  submit_download: ダウンロード
+  title_download_checked: チェックしたものを Zip アーカイブでダウンロードします
+  submit_email: 電子メール
+  title_send_checked_by_email: チェックしたものを電子メールで送信します
+  link_user_preferences: あなたの DMSF プロジェクト設定
+  heading_send_documents_by_email: 電子メールによる文書の送信
+  label_email_from: From
+  label_email_to: To
+  label_email_cc: CC
+  label_email_subject: 表題
+  label_email_documents: 文書
+  label_email_body: 本文
+  label_email_send: 送信
+  title_notifications_active: 通知は有効です
+  label_file_size: ファイルサイズ
+  heading_file_upload: アップロード
+  note_uploaded_maximum_files_at_once: "最大 %{number} ファイルを一度にアップロードすることができます。"
+  note_upload_files_greater_than_two_gb: 2GB より大きいファイルをアップロードするには 64bit 対応ブラウザが必要です。
+  submit_upload_files: アップロード
+  heading_new_folder: 新規フォルダ
+  label_title: タイトル
+  label_description: 説明
+  submit_save: 保存
+  info_file_locked: ファイルをロックしました！
+  label_notifications: 通知
+  select_option_default: 既定値
+  select_option_deactivated: 無効
+  select_option_activated: 有効
+  title_save_preferences: 設定を保存します
+  heading_revisions: リビジョン
+  title_download: ダウンロードします
+  title_delete_revision: リビジョンを削除します
+  label_created: 作成者/日時
+  label_changed: 更新者/日時
+  info_changed_by_user: "%{user} / %{changed}"
+  label_filename: ファイル名
+  label_version: バージョン
+  label_workflow: ワークフロー
+  label_mime: Mime
+  label_size: サイズ
+  label_comment: コメント
+  heading_new_revision: 新しいリビジョン
+  option_version_same: 変更なし
+  option_version_minor: マイナー
+  option_version_major: メジャー
+  label_new_content: 新規コンテンツ
+  label_maximum_files_upload: 最大ファイルアップロード数
+  note_maximum_number_of_files_uploaded: 一度にアップロードできるファイル数の上限。0は無制限。
+  label_maximum_files_download: 最大ファイルダウンロード数
+  note_maximum_number_of_files_downloaded: Zip でダウンロードできる、または電子メールで送られるファイル数の上限。0は無制限。
+  label_file_storage_directory: ファイル保存フォルダ
+  label_index_database: インデックスデータベース
+  label_stemming_language: 語幹抽出する言語
+  note_possible_values: 取りうる値
+  note_pass_none_to_disable_stemming: 語幹抽出を無効にするには 'none' を設定します。
+  label_stem_strategy: 抽出方針
+  option_stem_none: Stem none (既定値)
+  option_stem_some: Stem some
+  option_stem_all: Stem all
+  label_stemming_description: クエリ解釈ルーチンがどのように語幹抽出アルゴリズムを適用するかを制御します。既定値は、STEM_NONE です。設定可能な値は次のものです。
+  note_do_not_stem: 語幹抽出しません。
+  note_stem_some: "大文字から始まる、特定の文字の後に続く、あるいは位置情報を必要とするオペレーターと共に使われる語を除くそれ以外の語の語幹を検索します。語幹抽出された語は、先頭に 'Z' が付きます。"
+  note_stem_all: "すべての語の語幹を検索します。(注: 先頭に 'Z' は付きません。)"
+  note_stemming_applied: 語幹抽出アルゴリズムは、確率を測る対象の位置にある語にしか適用できない (論理演算子の用語自体は語幹抽出されない) ことにご注意ください。
+  label_default_notifications: ファイル通知の既定値  
+  heading_uploaded_files: アップロードされたファイル
+  submit_commit: コミット
+  link_documents: 文書
+  permission_view_dmsf_folders: 文書の一覧
+  permission_user_preferences: ユーザ設定
+  permission_view_dmsf_files: 文書の表示
+  permission_folder_manipulation: フォルダの操作
+  permission_file_manipulation: ファイルの操作
+  permission_file_approval: ファイルの承認
+  permission_force_file_unlock: ファイルの強制ロック解除
+  label_file: ファイル
+  field_folder: フォルダ
+  error_create_cycle_in_folder_dependency: フォルダの依存関係が循環しています
+  error_contains_invalid_character: 無効な文字を含んでいます
+  error_file_commit_require_uploaded_file: コミットするには、まずファイルをアップロードしてください
+  warning_some_files_were_not_commited: "いくつかのファイルは、バリデーションエラーのためにコミットされませんでした: %{files}"
+  error_user_has_not_right_delete_folder: ユーザにフォルダを削除する権限がありません
+  error_user_has_not_right_delete_file: ユーザにファイルを削除する権限がありません
+  notice_entries_deleted: エントリーを削除しました
+  warning_some_entries_were_not_deleted: "いくつかのエントリーは削除されませんでした: %{entries}"
+  question_do_you_really_want_to_delete_entries: 本当にチェックしたエントリーを削除しますか？
+  title_delete_checked: チェックしたものを削除します
+  title_number_of_files_in_directory: フォルダ内のファイル数
+  title_filename_for_download: ファイル名はダウンロードまたは Zip アーカイブに使われます
+  label_number_of_folders: フォルダ
+  label_number_of_documents: 文書
+  label_zip_names_encoding: Zip 名のエンコード
+  note_zip_names_encoding_iconv: 文字コードを utf-8 から目的のエンコードに変換するのに Iconv が使われています
+  error_file_storage_directory_does_not_exist: ファイル保存フォルダが存在せず作ることもできません
+  error_file_can_not_be_created: ファイルを保存フォルダに作ることができません
+  error_wrong_zip_encoding: Zip エンコーディングが正しくありません
+  warning_xapian_not_available: Xapian が利用できる状態になっていません
+  menu_dmsf: DMSF
+  label_physical_file_delete: 物理ファイルの削除
+  user_is_not_project_member: あなたはプロジェクトのメンバーではありません
+  heading_access_downloads_emails: ダウンロード/電子メール
+  heading_access_first: 初回アクセス
+  heading_access_last: 最終アクセス
+  label_dmsf_updated: DMSF updated
+  title_total_size_of_all_files: このフォルダにある全ファイルの合計サイズ
+  project_module_dmsf: DMSF
+  warning_no_project_to_copy_file_to: ファイルをコピーするプロジェクトがありません
+  comment_copied_from: "%{source} からコピーしました"
+  notice_file_copied: ファイルをコピーしました
+  notice_file_moved: ファイルを移動しました
+  label_target_project: ターゲットプロジェクト
+  label_target_folder: ターゲットフォルダ
+  title_copy_or_move: コピー/移動
+  label_dmsf_folder_plural: Dmsf フォルダ
+  comment_moved_from: "%{source} から移動しました"
+  error_target_folder_same: コピー/移動先のフォルダとプロジェクトが現在と同じです  
+  error_file_cannot_be_moved: ファイルを移動できません
+  error_file_cannot_be_copied: ファイルをコピーできません
+  warning_no_project_to_copy_folder_to: フォルダをコピーするプロジェクトがありません
+  title_copy: コピー
+  error_folder_cannot_be_copied: フォルダをコピーできません
+  notice_folder_copied: フォルダをコピーしました
+    
+  # Not translated
   
-# Not translated
-  
-  :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
-  :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
-  :label_maximum_email_filesize: "Maximum email attachment size"
-  :header_minimum_filesize: "File Error."
-  :error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
-  :parent_directory: "Parent Directory"
-  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
-  :label_webdav: "Webdav functionality"
-  :label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
+  error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
+  note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
+  label_maximum_email_filesize: "Maximum email attachment size"
+  header_minimum_filesize: "File Error."
+  error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
+  parent_directory: "Parent Directory"
+  note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
+  label_webdav: "Webdav functionality"
+  label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
 
-  :warning_folder_already_locked: "This folder is already locked"
-  :notice_folder_locked: "The folder was successfully locked"
-  :warning_folder_not_locked: "Unfortunately, the folder could not be locked"
-  :notice_folder_unlocked: "The folder was successfully unlocked"
-  :error_only_user_that_locked_folder_can_unlock_it: "You are not authorised to unlock this folder"
-  :title_folder_parent_locked: "Parent folder %{name} is locked"
-  :title_file_parent_locked: "Parent folder %{name} is locked"
-  :title_unlock_folder: "Unlock to allow changes for other members"
-  :title_lock_folder: "Lock to prevent changes for other members"
+  warning_folder_already_locked: "This folder is already locked"
+  notice_folder_locked: "The folder was successfully locked"
+  warning_folder_not_locked: "Unfortunately, the folder could not be locked"
+  notice_folder_unlocked: "The folder was successfully unlocked"
+  error_only_user_that_locked_folder_can_unlock_it: "You are not authorised to unlock this folder"
+  title_folder_parent_locked: "Parent folder %{name} is locked"
+  title_file_parent_locked: "Parent folder %{name} is locked"
+  title_unlock_folder: "Unlock to allow changes for other members"
+  title_lock_folder: "Lock to prevent changes for other members"
 
-  :select_option_webdav_readonly: "Read-only"
-  :select_option_webdav_readwrite: "Read/Write"
-  :label_webdav_strategy: "Webdav strategy"
-  :note_webdav_strategy: "Enables the administrator to decide if webdav is a read-only or read-write platform for end users."
+  select_option_webdav_readonly: "Read-only"
+  select_option_webdav_readwrite: "Read/Write"
+  label_webdav_strategy: "Webdav strategy"
+  note_webdav_strategy: "Enables the administrator to decide if webdav is a read-only or read-write platform for end users."
+
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
+  error_empty_note: The note can't be empty
+  error_workflow_assign: An error occured while assigning
+  error_cannot_start_workflow: Workflow can't be started
+  error_cannot_renumber_steps: Steps can't be renumbered
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
+  label_dmsf_workflow_step: Step
+  label_dmsf_workflow_step_plural: Steps
+  label_dmsf_workflow_approval: Approval
+  label_dmsf_workflow_approval_plural: Approvals
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Approve
+  label_dmsf_wokflow_action_reject: Reject
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
+  label_action: Action
+  label_note: Note  
+  title_none: None
+  title_rejection: Rejection
+  title_delegation: Delegation
+  title_assignment: Assignment
+  title_start: Start  
+  title_dmsf_workflow_log: Approval Workflow Log
+  title_assigned: Assigned
+  title_approval: Approval
+  title_rejected: Rejected
+  dmsf_and: AND
+  dmsf_or: OR
+  dmsf_new_step: New step  
+  message_dmsf_wokflow_note: Your note...
+  info_revision: "r%{rev}"
+  link_workflow: Workflow  
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 0adb0fcb..9e6fbb08 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -1,210 +1,246 @@
 # Russian translation for DMSF
 ru:
-  :dmsf: "DMSF"
-  :label_dmsf_file_plural: "Файлы DMSF"
-  :warning_no_entries_selected: "Файлы не выбраны"
-  :error_email_to_must_be_entered: "Нужно указать, на какую почту отправить письмо"
-  :notice_email_sent: "Письмо отправлено"
-  :warning_file_already_locked: "Файл уже заблокирован"
-  :notice_file_locked: "Файл заблокирован"
-  :warning_file_not_locked: "Файл не заблокирован"
-  :notice_file_unlocked: "Файл разблокирован"
-  :error_only_user_that_locked_file_can_unlock_it: "Только пользователь, который заблокировал файл, может его разблокировать"
-  :question_do_you_really_want_to_delete_this_entry: "Вы действительно хотите удалить этот файл?"
-  :error_max_files_exceeded: "Ограничение для %{number} одновременно загружаемых файлов превышено"
-  :question_do_you_really_want_to_delete_this_revision: "Вы действительно хотите удалить эту редакцию?"
-  :error_entry_project_does_not_match_current_project: "Проект, которому принадлежит файл, не соответсвует текущему проекту"
-  :notice_folder_created: "Папка создана"
-  :error_folder_creation_failed: "Папку не удалось создать"
-  :error_folder_title_must_be_entered: "Нужно указать название папки"
-  :notice_folder_deleted: "Папка удалена"
-  :error_folder_is_not_empty: "Папка не пустая"
-  :error_folder_title_is_already_used: "Название папки уже используется"
-  :notice_folder_details_were_saved: "Описание папки было сохранено"
-  :error_file_is_locked: "Файл заблокирован"
-  :notice_file_deleted: "Файл удален"
-  :error_at_least_one_revision_must_be_present: "По крайней мере, одна редакция должна присутствовать"
-  :notice_revision_deleted: "Редакция удалена"
-  :warning_one_of_files_locked: "Один из файлов заблокирован"
-  :notice_file_unlocked: "Файл разблокирован"
-  :notice_file_revision_created: "Редакция файла создана"
-  :notice_your_preferences_were_saved: "Ваши настройки были сохранены"
-  :warning_folder_notifications_already_activated: "Уведомления папки уже включены"
-  :notice_folder_notifications_activated: "Уведомления папки включены"
-  :warning_folder_notifications_already_deactivated: "Уведомления папки уже отключены"
-  :notice_folder_notifications_deactivated: "Уведомления папки отключены"
-  :warning_file_notifications_already_activated: "Уведомления файла уже включены"
-  :notice_file_notifications_activated: "Уведомления файла включены"
-  :warning_file_notifications_already_deactivated: "Уведомления файла уже отключены"
-  :notice_file_notifications_deactivated: "Уведомления файла отключены"
-  :link_details: "Подробности %{title}"
-  :link_edit: "Редактировать %{title}"
-  :submit_create: "Создать"
-  :link_create_folder: "Создать папку"
-  :title_check_uncheck_all_for_zip_download_or_email: "Выбрать/Снять все документы для того, чтобы скачать или отправить их по электронной почте"
-  :link_title: "Название"
-  :link_size: "Размер"
-  :link_modified: "Изменен"
-  :link_ver: "Версия"
-  :link_author: "Автор"
-  :title_check_for_zip_download_or_email: "Выберите документы, которые нужно скачать или отправить их по электронной почте"
-  :title_delete: "Удалить"
-  :title_notifications_active_deactivate: "Уведомления включены: Отключить"
-  :title_notifications_not_active_activate: "Уведомления не включены: Включить"
-  :title_title_version_version_download: "Скачать %{title} версию %{version}"
-  :title_locked_by_user: "Заблокировано пользователем %{user}"
-  :title_locked_by_you: "Заблокировано Вами"
-  :title_waiting_for_approval: "Ожидается на утверждение"
-  :title_approved: "Утверждено"
-  :title_unlock_file: "Разблокируйте файл, чтобы разрешить изменение его другими участниками"
-  :title_lock_file: "Заблокируйте файл, чтобы запретить его изменение другими участниками"
-  :submit_download: "Скачать"
-  :title_download_checked: "Скачать выбранные файлы"
-  :submit_email: "Отправить письмо"
-  :title_send_checked_by_email: "Отправить выбранные файлы по электронной почте"
-  :link_user_preferences: "Ваши настройки DMSF проекта"
-  :heading_send_documents_by_email: "Отправить документы по электронной почте"
-  :label_email_from: "От"
-  :label_email_to: "Кому"
-  :label_email_cc: "CC"
-  :label_email_subject: "Тема"
-  :label_email_documents: "Документы"
-  :label_email_body: "Содержание"
-  :label_email_send: "Отправить"
-  :title_notifications_active: "Уведомления активны"
-  :label_file_size: "Размер файла"
-  :heading_file_upload: "Закачать"
-  :note_uploaded_maximum_files_at_once: "За один раз можно загрузить только %{number} файлов."
-  :note_upload_files_greater_than_two_gb: "Чтобы загружать файлы размером больше чем 2 Гб у вас должен быть 64-битный браузер."
-  :submit_upload_files: "Загрузить"
-  :heading_new_folder: "Новая папка"
-  :label_title: "Заголовок"
-  :label_description: "Описание"
-  :submit_save: "Сохранить"
-  :info_file_locked: "Файл заблокирован!"
-  :label_notifications: "Уведомления"
-  :select_option_default: "По умолчанию"
-  :select_option_deactivated: "Отключено"
-  :select_option_activated: "Включено"
-  :title_save_preferences: "Сохранить настройки"
-  :heading_revisions: "Редакции"
-  :title_download: "Скачать"
-  :title_delete_revision: "Удалить редакцию"
-  :label_created: "Создан"
-  :label_changed: "Изменен"
-  :info_changed_by_user: "%{changed} пользователем %{user}"
-  :label_filename: "Имя файла"
-  :label_version: "Версия"
-  :label_workflow: "Поток работ"
-  :option_workflow_waiting_for_approval: "Ожидается на утверждение"
-  :option_workflow_approved: "Утверждено"
-  :option_workflow_none: "Нет"
-  :label_mime: "MIME-тип"
-  :label_size: "Размер"
-  :label_comment: "Комментарий"
-  :heading_new_revision: "Новая редакция"
-  :option_version_same: "Та же версия"
-  :option_version_minor: "Незначительные изменения"
-  :option_version_major: "Значительные изменения"
-  :label_new_content: "Новое содержание"
-  :label_maximum_files_upload: "Максимальное количество файлов для загрузки"
-  :note_maximum_number_of_files_uploaded: "Ограничивает максимальное количество файлов, которое может быть загружено за один раз. 0 означает отсутствие ограничений."
-  :label_maximum_files_download: "Максимальное количество файлов для скачивания"
-  :note_maximum_number_of_files_downloaded: "Ограничивает максимальное количество файлов, которое может быть скачано или отправлено по почте за один раз. 0 означает отсутствие ограничений."
-  :label_file_storage_directory: "Каталог для хранения файлов"
-  :label_index_database: "Индексная база данных"
-  :label_stemming_language: "Язык для стемминга"
-  :note_possible_values: "Возможные значения"
-  :note_pass_none_to_disable_stemming: "Укажите 'none' чтобы отключить стемминг"
-  :label_stem_strategy: "Стратегия стемминга"
-  :option_stem_none: "Нет (По умолчанию)"
-  :option_stem_some: "Некоторые"
-  :option_stem_all: "Все"
-  :label_stemming_description: "Это контролирует как парсер запросов будет применять алгоритм стемминга. Значением по умолчанию есть STEM_NONE. Возможны следующие значения"
-  :note_do_not_stem: "Не выполнять никакого стемминга."
-  :note_stem_some: "Искать обусловленные формы терминов за исключением тех, которые начинаются с большой буквы, или следуют после определенных символов, или используются с операторами, которым нужна информация о позиции. Обусловленные термины имеют префикс 'Z'."
-  :note_stem_all: "Искать обусловленные формы всех слов (примечание: Префикс 'Z' не добавляется)."
-  :note_stemming_applied: "Обратите внимание на то, что алгоритм стемминга применяется только к словам в вероятностных областях — логическое фильтрирует термины, которые никогда не обусловлены."
-  :label_default_notifications: "Значение по умолчанию для уведомлений"
-  :heading_uploaded_files: "Загруженные файлы"
-  :submit_commit: "Зафиксировать"
-  :link_documents: "Документы"
-  :permission_view_dmsf_folders: "Просматривать папки"
-  :permission_user_preferences: "Настройки пользователя"
-  :permission_view_dmsf_files: "Просматривать документы"
-  :permission_folder_manipulation: "Управление папками"
-  :permission_file_manipulation: "Управление файлами"
-  :permission_file_approval: "Утверждение файлов"
-  :permission_force_file_unlock: "Разблокировка любых файлов"
-  :label_file: "Файл"
-  :field_folder: "Папка"
-  :error_create_cycle_in_folder_dependency: "создать циклическую зависимость в папке"
-  :error_contains_invalid_character: "содержит недопустимые символы"
-  :error_file_commit_require_uploaded_file: "Чтобы зафиксировать файл нужно для начала его загрузить"
-  :warning_some_files_were_not_commited: "Некоторые файлы не были зафиксированы через ошибки валидации: %{files}"
-  :error_user_has_not_right_delete_folder: "Пользователь не имеет нужных прав для удаления папки"
-  :error_user_has_not_right_delete_file: "Пользователь не имеет нужных прав для удаления файла"
-  :notice_entries_deleted: "Файлы удалены"
-  :warning_some_entries_were_not_deleted: "Некоторые файлы не были удалены: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "Вы действительно хотите удалить выбранные файлы?"
-  :title_delete_checked: "Удалить выбранные документы"
-  :title_number_of_files_in_directory: "Количество файлов в директории"
-  :title_filename_for_download: "Имя файла для скачиваемого архива"
-  :label_number_of_folders: "Папок"
-  :label_number_of_documents: "Документов"
-  :label_zip_names_encoding: "Кодировка zip имен"
-  :note_zip_names_encoding_iconv: "Iconv используется для преобразования с кодировки UTF-8 в целевую кодировку"
-  :error_file_storage_directory_does_not_exist: "Каталог для хранения файлов не существует и не может быть создан"
-  :error_file_can_not_be_created: "Файл не может быть создан в каталоге хранения файлов"
-  :error_wrong_zip_encoding: "Неверная кодировка zip"
-  :warning_xapian_not_available: "Xapian не доступен"
-  :menu_dmsf: "Документы"
-  :label_physical_file_delete: "Физическое удаление файла"
-  :user_is_not_project_member: "Вы не являетесь участником проекта"
-  :heading_access_downloads_emails: "Скачивание / Отправка по почте"
-  :heading_access_first: "Первый"
-  :heading_access_last: "Последний"
-  :label_dmsf_updated: "Документ обновлен"
-  :title_total_size_of_all_files: "Общий размер всех файлов в этой папке"
-  :project_module_dmsf: "DMSF"
-  :warning_no_project_to_copy_file_to: "Не выбран проект, в который нужно скопировать файл"
-  :comment_copied_from: "Скопировано из %{source}"
-  :notice_file_copied: "Файл скопирован"
-  :notice_file_moved: "Файл перемещен"
-  :label_target_project: "Целевой проект"
-  :label_target_folder: "Целевая папка"
-  :title_copy_or_move: "Копировать/Переместить"
-  :label_dmsf_folder_plural: "DMSF папки"
-  :comment_moved_from: "Перемещен из %{source}"
-  :error_target_folder_same: "Целевая папка и проект совпадают с текущими"
-  :error_file_cannot_be_moved: "Файл не может быть перемещен"
-  :error_file_cannot_be_copied: "Файл не может быть скопирован"
-  :warning_no_project_to_copy_folder_to: "Не выбран проект, в который нужно скопировать папку"
-  :title_copy: "Копировать"
-  :error_folder_cannot_be_copied: "Папка не может быть скопирована"
-  :notice_folder_copied: "Папка скопирована"
+  dmsf: DMSF
+  label_dmsf_file_plural: Файлы DMSF
+  warning_no_entries_selected: Файлы не выбраны
+  error_email_to_must_be_entered: Нужно указать, на какую почту отправить письмо
+  notice_email_sent: Письмо отправлено
+  warning_file_already_locked: Файл уже заблокирован
+  notice_file_locked: Файл заблокирован
+  warning_file_not_locked: Файл не заблокирован
+  notice_file_unlocked: Файл разблокирован
+  error_only_user_that_locked_file_can_unlock_it: Только пользователь, который заблокировал файл, может его разблокировать
+  question_do_you_really_want_to_delete_this_entry: Вы действительно хотите удалить этот файл?
+  error_max_files_exceeded: "Ограничение для %{number} одновременно загружаемых файлов превышено"
+  question_do_you_really_want_to_delete_this_revision: Вы действительно хотите удалить эту редакцию?
+  error_entry_project_does_not_match_current_project: Проект, которому принадлежит файл, не соответсвует текущему проекту
+  notice_folder_created: Папка создана
+  error_folder_creation_failed: Папку не удалось создать
+  error_folder_title_must_be_entered: Нужно указать название папки
+  notice_folder_deleted: Папка удалена
+  error_folder_is_not_empty: Папка не пустая
+  error_folder_title_is_already_used: Название папки уже используется
+  notice_folder_details_were_saved: Описание папки было сохранено
+  error_file_is_locked: Файл заблокирован
+  notice_file_deleted: Файл удален
+  error_at_least_one_revision_must_be_present: По крайней мере, одна редакция должна присутствовать
+  notice_revision_deleted: Редакция удалена
+  warning_one_of_files_locked: Один из файлов заблокирован
+  notice_file_unlocked: Файл разблокирован
+  notice_file_revision_created: Редакция файла создана
+  notice_your_preferences_were_saved: Ваши настройки были сохранены
+  warning_folder_notifications_already_activated: Уведомления папки уже включены
+  notice_folder_notifications_activated: Уведомления папки включены
+  warning_folder_notifications_already_deactivated: Уведомления папки уже отключены
+  notice_folder_notifications_deactivated: Уведомления папки отключены
+  warning_file_notifications_already_activated: Уведомления файла уже включены
+  notice_file_notifications_activated: Уведомления файла включены
+  warning_file_notifications_already_deactivated: Уведомления файла уже отключены
+  notice_file_notifications_deactivated: Уведомления файла отключены
+  link_details: "Подробности %{title}"
+  link_edit: "Редактировать %{title}"
+  submit_create: Создать
+  link_create_folder: Создать папку
+  title_check_uncheck_all_for_zip_download_or_email: Выбрать/Снять все документы для того, чтобы скачать или отправить их по электронной почте
+  link_title: Название
+  link_size: Размер
+  link_modified: Изменен
+  link_ver: Версия
+  link_author: Автор
+  title_check_for_zip_download_or_email: Выберите документы, которые нужно скачать или отправить их по электронной почте
+  title_delete: Удалить
+  title_notifications_active_deactivate: "Уведомления включены: Отключить"
+  title_notifications_not_active_activate: "Уведомления не включены: Включить"
+  title_title_version_version_download: "Скачать %{title} версию %{version}"
+  title_locked_by_user: "Заблокировано пользователем %{user}"
+  title_locked_by_you: Заблокировано Вами
+  title_waiting_for_approval: Ожидается на утверждение
+  title_approved: Утверждено
+  title_unlock_file: Разблокируйте файл, чтобы разрешить изменение его другими участниками
+  title_lock_file: Заблокируйте файл, чтобы запретить его изменение другими участниками
+  submit_download: Скачать
+  title_download_checked: Скачать выбранные файлы
+  submit_email: Отправить письмо
+  title_send_checked_by_email: Отправить выбранные файлы по электронной почте
+  link_user_preferences: Ваши настройки DMSF проекта
+  heading_send_documents_by_email: Отправить документы по электронной почте
+  label_email_from: От
+  label_email_to: Кому
+  label_email_cc: CC
+  label_email_subject: Тема
+  label_email_documents: Документы
+  label_email_body: Содержание
+  label_email_send: Отправить
+  title_notifications_active: Уведомления активны
+  label_file_size: Размер файла
+  heading_file_upload: Закачать
+  note_uploaded_maximum_files_at_once: "За один раз можно загрузить только %{number} файлов."
+  note_upload_files_greater_than_two_gb: Чтобы загружать файлы размером больше чем 2 Гб у вас должен быть 64-битный браузер.
+  submit_upload_files: Загрузить
+  heading_new_folder: Новая папка
+  label_title: Заголовок
+  label_description: Описание
+  submit_save: Сохранить
+  info_file_locked: Файл заблокирован!
+  label_notifications: Уведомления
+  select_option_default: По умолчанию
+  select_option_deactivated: Отключено
+  select_option_activated: Включено
+  title_save_preferences: Сохранить настройки
+  heading_revisions: Редакции
+  title_download: Скачать
+  title_delete_revision: Удалить редакцию
+  label_created: Создан
+  label_changed: Изменен
+  info_changed_by_user: "%{changed} пользователем %{user}"
+  label_filename: Имя файла
+  label_version: Версия
+  label_workflow: Поток работ
+  label_mime: MIME-тип
+  label_size: Размер
+  label_comment: Комментарий
+  heading_new_revision: Новая редакция
+  option_version_same: Та же версия
+  option_version_minor: Незначительные изменения
+  option_version_major: Значительные изменения
+  label_new_content: Новое содержание
+  label_maximum_files_upload: Максимальное количество файлов для загрузки
+  note_maximum_number_of_files_uploaded: Ограничивает максимальное количество файлов, которое может быть загружено за один раз. 0 означает отсутствие ограничений.
+  label_maximum_files_download: Максимальное количество файлов для скачивания
+  note_maximum_number_of_files_downloaded: Ограничивает максимальное количество файлов, которое может быть скачано или отправлено по почте за один раз. 0 означает отсутствие ограничений.
+  label_file_storage_directory: Каталог для хранения файлов
+  label_index_database: Индексная база данных
+  label_stemming_language: Язык для стемминга
+  note_possible_values: Возможные значения
+  note_pass_none_to_disable_stemming: "Укажите 'none' чтобы отключить стемминг"
+  label_stem_strategy: Стратегия стемминга
+  option_stem_none: Нет (По умолчанию)
+  option_stem_some: Некоторые
+  option_stem_all: Все
+  label_stemming_description: Это контролирует как парсер запросов будет применять алгоритм стемминга. Значением по умолчанию есть STEM_NONE. Возможны следующие значения
+  note_do_not_stem: Не выполнять никакого стемминга."
+  note_stem_some: "Искать обусловленные формы терминов за исключением тех, которые начинаются с большой буквы, или следуют после определенных символов, или используются с операторами, которым нужна информация о позиции. Обусловленные термины имеют префикс 'Z'."
+  note_stem_all: "Искать обусловленные формы всех слов (примечание: Префикс 'Z' не добавляется)."
+  note_stemming_applied: Обратите внимание на то, что алгоритм стемминга применяется только к словам в вероятностных областях — логическое фильтрирует термины, которые никогда не обусловлены.
+  label_default_notifications: Значение по умолчанию для уведомлений
+  heading_uploaded_files: Загруженные файлы
+  submit_commit: Зафиксировать
+  link_documents: Документы
+  permission_view_dmsf_folders: Просматривать папки
+  permission_user_preferences: Настройки пользователя
+  permission_view_dmsf_files: Просматривать документы
+  permission_folder_manipulation: Управление папками
+  permission_file_manipulation: Управление файлами
+  permission_file_approval: Утверждение файлов
+  permission_force_file_unlock: Разблокировка любых файлов
+  label_file: Файл
+  field_folder: Папка
+  error_create_cycle_in_folder_dependency: создать циклическую зависимость в папке
+  error_contains_invalid_character: содержит недопустимые символы
+  error_file_commit_require_uploaded_file: Чтобы зафиксировать файл нужно для начала его загрузить
+  warning_some_files_were_not_commited: "Некоторые файлы не были зафиксированы через ошибки валидации: %{files}"
+  error_user_has_not_right_delete_folder: Пользователь не имеет нужных прав для удаления папки
+  error_user_has_not_right_delete_file: Пользователь не имеет нужных прав для удаления файла
+  notice_entries_deleted: Файлы удалены
+  warning_some_entries_were_not_deleted: "Некоторые файлы не были удалены: %{entries}"
+  question_do_you_really_want_to_delete_entries: Вы действительно хотите удалить выбранные файлы?
+  title_delete_checked: Удалить выбранные документы
+  title_number_of_files_in_directory: Количество файлов в директории
+  title_filename_for_download: Имя файла для скачиваемого архива
+  label_number_of_folders: Папок
+  label_number_of_documents: Документов
+  label_zip_names_encoding: Кодировка zip имен
+  note_zip_names_encoding_iconv: Iconv используется для преобразования с кодировки UTF-8 в целевую кодировку
+  error_file_storage_directory_does_not_exist: Каталог для хранения файлов не существует и не может быть создан
+  error_file_can_not_be_created: Файл не может быть создан в каталоге хранения файлов
+  error_wrong_zip_encoding: Неверная кодировка zip
+  warning_xapian_not_available: Xapian не доступен
+  menu_dmsf: Документы
+  label_physical_file_delete: Физическое удаление файла
+  user_is_not_project_member: Вы не являетесь участником проекта
+  heading_access_downloads_emails: Скачивание / Отправка по почте
+  heading_access_first: Первый
+  heading_access_last: Последний
+  label_dmsf_updated: Документ обновлен
+  title_total_size_of_all_files: Общий размер всех файлов в этой папке
+  project_module_dmsf: DMSF
+  warning_no_project_to_copy_file_to: Не выбран проект, в который нужно скопировать файл
+  comment_copied_from: "Скопировано из %{source}"
+  notice_file_copied: Файл скопирован
+  notice_file_moved: Файл перемещен
+  label_target_project: Целевой проект
+  label_target_folder: Целевая папка
+  title_copy_or_move: Копировать/Переместить
+  label_dmsf_folder_plural: DMSF папки
+  comment_moved_from: "Перемещен из %{source}"
+  error_target_folder_same: Целевая папка и проект совпадают с текущими
+  error_file_cannot_be_moved: Файл не может быть перемещен
+  error_file_cannot_be_copied: Файл не может быть скопирован
+  warning_no_project_to_copy_folder_to: Не выбран проект, в который нужно скопировать папку
+  title_copy: Копировать
+  error_folder_cannot_be_copied: Папка не может быть скопирована
+  notice_folder_copied: Папка скопирована
 
-  :error_max_email_filesize_exceeded: "Вы превысили максимальный размер для отправки по электронной почте. (%{number} Мб)"
-  :note_maximum_email_filesize: "Ограничение максимального размера файла, который можно отправить по электронной почте. 0 означает отсутствие ограничений. Значение в мегабайтах."
-  :label_maximum_email_filesize: "Максимальный размер вложения в письме"
-  :header_minimum_filesize: "Ошибка файла."
-  :error_minimum_filesize: "Файла %{file} является пустым и он не будет прикреплен."
-  :parent_directory: "Родительская директория"
-  :note_webdav: "После включения, WebDAV можно найти по адресу http://redmine-host/dmsf/webdav/"
-  :label_webdav: "Функциональность WebDAV"
-  :label_dmsf_plural: "Скопировать DMSF файлы и папки (%{files} файлов в %{folders} папках)"
+  error_max_email_filesize_exceeded: "Вы превысили максимальный размер для отправки по электронной почте. (%{number} Мб)"
+  note_maximum_email_filesize: "Ограничение максимального размера файла, который можно отправить по электронной почте. 0 означает отсутствие ограничений. Значение в мегабайтах."
+  label_maximum_email_filesize: "Максимальный размер вложения в письме"
+  header_minimum_filesize: "Ошибка файла."
+  error_minimum_filesize: "Файла %{file} является пустым и он не будет прикреплен."
+  parent_directory: "Родительская директория"
+  note_webdav: "После включения, WebDAV можно найти по адресу http://redmine-host/dmsf/webdav/"
+  label_webdav: "Функциональность WebDAV"
+  label_dmsf_plural: "Скопировать DMSF файлы и папки (%{files} файлов в %{folders} папках)"
 
-  :warning_folder_already_locked: "Эта папка уже заблокирована"
-  :notice_folder_locked: "Папка была успешно заблокирована"
-  :warning_folder_not_locked: "К сожалению, папка не может быть заблокирована"
-  :notice_folder_unlocked: "Папка была успешно разблокирована"
-  :error_only_user_that_locked_folder_can_unlock_it: "Только пользователь, который заблокировал папку, может её разблокировать"
-  :title_folder_parent_locked: "Родительская папка %{name} заблокирована"
-  :title_file_parent_locked: "Родительская папка %{name} заблокирована"
-  :title_unlock_folder: "Разблокируйте папку, чтобы разрешить изменение её другими участниками"
-  :title_lock_folder: "Заблокируйте папку, чтобы запретить ёё изменение другими участниками"
+  warning_folder_already_locked: "Эта папка уже заблокирована"
+  notice_folder_locked: "Папка была успешно заблокирована"
+  warning_folder_not_locked: "К сожалению, папка не может быть заблокирована"
+  notice_folder_unlocked: "Папка была успешно разблокирована"
+  error_only_user_that_locked_folder_can_unlock_it: "Только пользователь, который заблокировал папку, может её разблокировать"
+  title_folder_parent_locked: "Родительская папка %{name} заблокирована"
+  title_file_parent_locked: "Родительская папка %{name} заблокирована"
+  title_unlock_folder: "Разблокируйте папку, чтобы разрешить изменение её другими участниками"
+  title_lock_folder: "Заблокируйте папку, чтобы запретить ёё изменение другими участниками"
 
-  :select_option_webdav_readonly: "Только для чтения"
-  :select_option_webdav_readwrite: "Чтение/Запись"
-  :label_webdav_strategy: "Стратегия WebDAV"
-  :note_webdav_strategy: "Позволяет администратору решить в каком режиме предоставить доступ к WebDAV для конечных пользователей (Только для чтения или Чтение+Запись)."
+  select_option_webdav_readonly: "Только для чтения"
+  select_option_webdav_readwrite: "Чтение/Запись"
+  label_webdav_strategy: "Стратегия WebDAV"
+  note_webdav_strategy: "Позволяет администратору решить в каком режиме предоставить доступ к WebDAV для конечных пользователей (Только для чтения или Чтение+Запись)."
+
+  # Not translated
+
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
+  error_empty_note: The note can't be empty
+  error_workflow_assign: An error occured while assigning
+  error_cannot_start_workflow: Workflow can't be started
+  error_cannot_renumber_steps: Steps can't be renumbered
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
+  label_dmsf_workflow_step: Step
+  label_dmsf_workflow_step_plural: Steps
+  label_dmsf_workflow_approval: Approval
+  label_dmsf_workflow_approval_plural: Approvals
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Approve
+  label_dmsf_wokflow_action_reject: Reject
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
+  label_action: Action
+  label_note: Note  
+  title_none: None
+  title_rejection: Rejection
+  title_delegation: Delegation
+  title_assignment: Assignment
+  title_start: Start  
+  title_dmsf_workflow_log: Approval Workflow Log
+  title_assigned: Assigned
+  title_approval: Approval
+  title_rejected: Rejected
+  dmsf_and: AND
+  dmsf_or: OR
+  dmsf_new_step: New step  
+  message_dmsf_wokflow_note: Your note...
+  info_revision: "r%{rev}"
+  link_workflow: Workflow  
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file
diff --git a/config/locales/zh.yml b/config/locales/zh.yml
index 6f17acd3..518e9e31 100644
--- a/config/locales/zh.yml
+++ b/config/locales/zh.yml
@@ -1,214 +1,247 @@
 # Chinese translation for DMSF
 zh:
-  :dmsf: "文档管家"
-  :label_dmsf_file_plural: "Dmsf files"
-  :warning_no_entries_selected: "未选择任何条目"
-  :error_email_to_must_be_entered: "请输入电子邮件"
-  :notice_email_sent: "邮件已发送"
-  :warning_file_already_locked: "文件已经锁定"
-  :notice_file_locked: "文件锁定"
-  :warning_file_not_locked: "文件未锁定"
-  :notice_file_unlocked: "文件解锁"
-  :error_only_user_that_locked_file_can_unlock_it: "只有锁定文件的用户才能解锁该文件"
-  :question_do_you_really_want_to_delete_this_entry: "您确定删除此条目?"
-  :error_max_files_exceeded: "超出同时下载%{number}个文件数量限制"
-  :question_do_you_really_want_to_delete_this_revision: "您确定删除此修订版本吗?"
-  :error_entry_project_does_not_match_current_project: "入口项目与当前项目不匹配"
-  :notice_folder_created: "文件夹创建完毕"
-  :error_folder_creation_failed: "文件夹创建失败"
-  :error_folder_title_must_be_entered: "请输入主题"
-  :notice_folder_deleted: "文件夹已删除"
-  :error_folder_is_not_empty: "非空文件夹"
-  :error_folder_title_is_already_used: "标题已经被使用"
-  :notice_folder_details_were_saved: "文件夹详细信息已保存"
-  :error_file_is_locked: "文件被锁定"
-  :notice_file_deleted: "文件已删除"
-  :error_at_least_one_revision_must_be_present: "至少一个修订版本必须存在"
-  :notice_revision_deleted: "修订版本已删除"
-  :warning_one_of_files_locked: "其中一个文件被锁定"
-  :notice_file_unlocked: "文件解锁"
-  :notice_file_revision_created: "文件修订版本已创建"
-  :notice_your_preferences_were_saved: "您的偏好设定已保存"
-  :warning_folder_notifications_already_activated: "文件夹通知已激活"
-  :notice_folder_notifications_activated: "文件夹通知激活"
-  :warning_folder_notifications_already_deactivated: "文件夹通知已注销"
-  :notice_folder_notifications_deactivated: "文件夹通知注销"
-  :warning_file_notifications_already_activated: "文件通知已激活"
-  :notice_file_notifications_activated: "文件通知激活"
-  :warning_file_notifications_already_deactivated: "文件通知已注销"
-  :notice_file_notifications_deactivated: "文件通知注销"
-  :link_details: "%{title} 详情"
-  :link_edit: "编辑 %{title}"
-  :submit_create: "创建"
-  :link_create_folder: "创建文件夹"
-  :title_check_uncheck_all_for_zip_download_or_email: "全选/全不选（zip下载或邮件发送）"
-  :link_title: "主题"
-  :link_size: "大小"
-  :link_modified: "修改日期"
-  :link_ver: "版本."
-  :link_author: "作者"
-  :title_check_for_zip_download_or_email: "选中用于Zip下载或邮件发送"
-  :title_delete: "删除"
-  :title_notifications_active_deactivate: "通知有效：点击注销通知"
-  :title_notifications_not_active_activate: "通知无效:点击激活通知"
-  :title_title_version_version_download: " 下载‘%{title}’版本‘%{version}’"
-  :title_locked_by_user: "%{user}锁定"
-  :title_locked_by_you: "您锁定"
-  :title_waiting_for_approval: "待批准"
-  :title_approved: "已批准"
-  :title_unlock_file: "解除锁定允许其他成员修改"
-  :title_lock_file: "锁定以防其他成员修改"
-  :submit_download: "下载"
-  :title_download_checked: "zip归档下载所选"
-  :submit_email: "电子邮件"
-  :title_send_checked_by_email: "电子邮件发送所选"
-  :link_user_preferences: "您的文档管理系统项目偏好设定"
-  :heading_send_documents_by_email: "电子邮件发送文档"
-  :label_email_from: "发件人"
-  :label_email_to: "收件人"
-  :label_email_cc: "抄送"
-  :label_email_subject: "主题"
-  :label_email_documents: "文档"
-  :label_email_body: "正文"
-  :label_email_send: "发送"
-  :title_notifications_active: "通知处于有效状态"
-  :label_file_size: "文件大小"
-  :heading_file_upload: "上传"
-  :note_uploaded_maximum_files_at_once: "一次最多上传%{number}个文件."
-  :note_upload_files_greater_than_two_gb: "为了上传大于2GB文件，您需要64位版本的浏览器."
-  :submit_upload_files: "上传"
-  :heading_new_folder: "新建文件夹"
-  :label_title: "标题"
-  :label_description: "描述"
-  :submit_save: "保存"
-  :info_file_locked: "文件已被锁定!"
-  :label_notifications: "通知功能"
-  :select_option_default: "默认"
-  :select_option_deactivated: "注销"
-  :select_option_activated: "激活"
-  :title_save_preferences: "保存偏好设定"
-  :heading_revisions: "修订版本"
-  :title_download: "下载"
-  :title_delete_revision: "删除此修订"
-  :label_created: "创建"
-  :label_changed: "修改"
-  :info_changed_by_user: "%{changed} by %{user}"
-  :label_filename: "文件名"
-  :label_version: "版本"
-  :label_workflow: "工作流程"
-  :option_workflow_waiting_for_approval: "待批准"
-  :option_workflow_approved: "已批准"
-  :option_workflow_none: "无"
-  :label_mime: "Mime"
-  :label_size: "大小"
-  :label_comment: "注释"
-  :heading_new_revision: "新修订"
-  :option_version_same: "Same"
-  :option_version_minor: "Minor"
-  :option_version_major: "Major"
-  :label_new_content: "新内容"
-  :label_maximum_files_upload: "最大上传文件数"
-  :note_maximum_number_of_files_uploaded: "一次上传的最大文件数量. 0表示无限制."
-  :label_maximum_files_download: "最大下载文件数"
-  :note_maximum_number_of_files_downloaded: "最大文件下载数量(zip或发送电子邮件方式). 0表示无限制."
-  :label_file_storage_directory: "文件存储目录"
-  :label_index_database: "Index database"
-  :label_stemming_language: "Stemming Language"
-  :note_possible_values: "Possible values"
-  :note_pass_none_to_disable_stemming: "pass 'none' to disable stemming"
-  :label_stem_strategy: "Stem strategy"
-  :option_stem_none: "Stem none (default)"
-  :option_stem_some: "Stem some"
-  :option_stem_all: "Stem all"
-  :label_stemming_description: "This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are"
-  :note_do_not_stem: "Don't perform any stemming."
-  :note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'."
-  :note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)."
-  :note_stemming_applied: "Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed."
-  :label_default_notifications: "文件默认通知"
-  :heading_uploaded_files: "上传文件"
-  :submit_commit: "提交"
-  :link_documents: "文档"
-  :permission_view_dmsf_folders: "浏览文档"
-  :permission_user_preferences: "用户偏好设定"
-  :permission_view_dmsf_files: "查看文档"
-  :permission_folder_manipulation: "文件夹操作"
-  :permission_file_manipulation: "文件操作"
-  :permission_file_approval: "批准文件"
-  :permission_force_file_unlock: "强制文件解锁"
-  :label_file: "文件"
-  :field_folder: "文件夹"
-  :error_create_cycle_in_folder_dependency: "create cycle in folder dependency"
-  :error_contains_invalid_character: "含有无效字符"
-  :error_file_commit_require_uploaded_file: "文件提交要求上传文件"
-  :warning_some_files_were_not_commited: "某些文件因验证错误未能被提交: %{files}"
-  :error_user_has_not_right_delete_folder: "用户没有权限删除文件夹"
-  :error_user_has_not_right_delete_file: "用户没有权限删除文件"
-  :notice_entries_deleted: "条目已删除"
-  :warning_some_entries_were_not_deleted: "某些条目未被删除: %{entries}"
-  :question_do_you_really_want_to_delete_entries: "您确定删除所选的条目吗?"
-  :title_delete_checked: "删除选中"
-  :title_number_of_files_in_directory: "目录总文件个数"
-  :title_filename_for_download: "用于下载或zip归档的文件名"
-  :label_number_of_folders: "Folders"
-  :label_number_of_documents: "Documents"
-  :label_zip_names_encoding: "Zip文件名编码"
-  :note_zip_names_encoding_iconv: "Iconv is used for charset conversion from utf-8 to target encoding"
-  :error_file_storage_directory_does_not_exist: "文件存储目录不存在或不能创建"
-  :error_file_can_not_be_created: "文件未能在存储目录中创建"
-  :error_wrong_zip_encoding: "不正确的Zip编码"
-  :warning_xapian_not_available: "Xapian not available"
-  :menu_dmsf: "文档管家"
-  :label_physical_file_delete: "物理删除文件"
-  :user_is_not_project_member: "您不是该项目的成员"
-  :heading_access_downloads_emails: "存取次数"
-  :heading_access_first: "首次"
-  :heading_access_last: "末次"
-  :label_dmsf_updated: "DMSF updated"
-  :title_total_size_of_all_files: "文件夹所有文件总大小"
-  :project_module_dmsf: "文档管家"
+  dmsf: 文档管家
+  label_dmsf_file_plural: Dmsf files
+  warning_no_entries_selected: 未选择任何条目
+  error_email_to_must_be_entered: 请输入电子邮件
+  notice_email_sent: 邮件已发送
+  warning_file_already_locked: 文件已经锁定
+  notice_file_locked: 文件锁定
+  warning_file_not_locked: 文件未锁定
+  notice_file_unlocked: 文件解锁
+  error_only_user_that_locked_file_can_unlock_it: 只有锁定文件的用户才能解锁该文件
+  question_do_you_really_want_to_delete_this_entry: 您确定删除此条目?
+  error_max_files_exceeded: "超出同时下载%{number}个文件数量限制"
+  question_do_you_really_want_to_delete_this_revision: 您确定删除此修订版本吗?
+  error_entry_project_does_not_match_current_project: 入口项目与当前项目不匹配
+  notice_folder_created: 文件夹创建完毕
+  error_folder_creation_failed: 文件夹创建失败
+  error_folder_title_must_be_entered: 请输入主题
+  notice_folder_deleted: 文件夹已删除
+  error_folder_is_not_empty: 非空文件夹
+  error_folder_title_is_already_used: 标题已经被使用
+  notice_folder_details_were_saved: 文件夹详细信息已保存  
+  error_file_is_locked: 文件被锁定
+  notice_file_deleted: 文件已删除
+  error_at_least_one_revision_must_be_present: 至少一个修订版本必须存在
+  notice_revision_deleted: 修订版本已删除
+  warning_one_of_files_locked: 其中一个文件被锁定
+  notice_file_unlocked: 文件解锁
+  notice_file_revision_created: 文件修订版本已创建
+  notice_your_preferences_were_saved: 您的偏好设定已保存
+  warning_folder_notifications_already_activated: 文件夹通知已激活
+  notice_folder_notifications_activated: 文件夹通知激活
+  warning_folder_notifications_already_deactivated: 文件夹通知已注销
+  notice_folder_notifications_deactivated: 文件夹通知注销
+  warning_file_notifications_already_activated: 文件通知已激活
+  notice_file_notifications_activated: 文件通知激活
+  warning_file_notifications_already_deactivated: 文件通知已注销
+  notice_file_notifications_deactivated: 文件通知注销
+  link_details: "%{title} 详情"
+  link_edit: "编辑 %{title}"
+  submit_create: 创建
+  link_create_folder: 创建文件夹
+  title_check_uncheck_all_for_zip_download_or_email: 全选/全不选（zip下载或邮件发送）
+  link_title: 主题
+  link_size: 大小
+  link_modified: 修改日期
+  link_ver: 版本.
+  link_author: 作者
+  title_check_for_zip_download_or_email: 选中用于Zip下载或邮件发送
+  title_delete: 删除
+  title_notifications_active_deactivate: "通知有效：点击注销通知"
+  title_notifications_not_active_activate: "通知无效:点击激活通知"
+  title_title_version_version_download: " 下载‘%{title}’版本‘%{version}’"
+  title_locked_by_user: "%{user}锁定"
+  title_locked_by_you: 您锁定
+  title_waiting_for_approval: 待批准
+  title_approved: 已批准
+  title_unlock_file: 解除锁定允许其他成员修改
+  title_lock_file: 锁定以防其他成员修改
+  submit_download: 下载
+  title_download_checked: zip归档下载所选
+  submit_email: 电子邮件
+  title_send_checked_by_email: 电子邮件发送所选
+  link_user_preferences: 您的文档管理系统项目偏好设定
+  heading_send_documents_by_email: 电子邮件发送文档
+  label_email_from: 发件人
+  label_email_to: 收件人
+  label_email_cc: 抄送
+  label_email_subject: 主题
+  label_email_documents: 文档
+  label_email_body: 正文
+  label_email_send: 发送
+  title_notifications_active: 通知处于有效状态
+  label_file_size: 文件大小
+  heading_file_upload: 上传
+  note_uploaded_maximum_files_at_once: "一次最多上传%{number}个文件."
+  note_upload_files_greater_than_two_gb: 为了上传大于2GB文件，您需要64位版本的浏览器.
+  submit_upload_files: 上传
+  heading_new_folder: 新建文件夹
+  label_title: 标题
+  label_description: 描述
+  submit_save: 保存
+  info_file_locked: 文件已被锁定!
+  label_notifications: 通知功能
+  select_option_default: 默认
+  select_option_deactivated: 注销
+  select_option_activated: 激活
+  title_save_preferences: 保存偏好设定
+  heading_revisions: 修订版本
+  title_download: 下载
+  title_delete_revision: 删除此修订
+  label_created: 创建
+  label_changed: 修改
+  info_changed_by_user: "%{changed} by %{user}"
+  label_filename: 文件名
+  label_version: 版本
+  label_workflow: 工作流程
+  label_mime: Mime
+  label_size: 大小
+  label_comment: 注释
+  heading_new_revision: 新修订
+  option_version_same: Same
+  option_version_minor: Minor
+  option_version_major: Major
+  label_new_content: 新内容
+  label_maximum_files_upload: 最大上传文件数
+  note_maximum_number_of_files_uploaded: 一次上传的最大文件数量. 0表示无限制.
+  label_maximum_files_download: 最大下载文件数
+  note_maximum_number_of_files_downloaded: 最大文件下载数量(zip或发送电子邮件方式). 0表示无限制.
+  label_file_storage_directory: 文件存储目录
+  label_index_database: Index database
+  label_stemming_language: Stemming Language
+  note_possible_values: Possible values
+  note_pass_none_to_disable_stemming: "pass 'none' to disable stemming"
+  label_stem_strategy: Stem strategy
+  option_stem_none: Stem none (default)
+  option_stem_some: Stem some
+  option_stem_all: Stem all
+  label_stemming_description: This controls how the query parser will apply the stemming algorithm. The default value is STEM_NONE. The possible values are
+  note_do_not_stem: "Don't perform any stemming."
+  note_stem_some: "Search for stemmed forms of terms except for those which start with a capital letter, or are followed by certain characters, or are used with operators which need positional information. Stemmed terms are prefixed with 'Z'."
+  note_stem_all: "Search for stemmed forms of all words (note: no 'Z' prefix is added)."
+  note_stemming_applied: Note that the stemming algorithm is only applied to words in probabilistic fields - boolean filter terms are never stemmed.
+  label_default_notifications: 文件默认通知
+  heading_uploaded_files: 上传文件
+  submit_commit: 提交
+  link_documents: 文档
+  permission_view_dmsf_folders: 浏览文档
+  permission_user_preferences: 用户偏好设定
+  permission_view_dmsf_files: 查看文档
+  permission_folder_manipulation: 文件夹操作
+  permission_file_manipulation: 文件操作
+  permission_file_approval: 批准文件
+  permission_force_file_unlock: 强制文件解锁
+  label_file: 文件
+  field_folder: 件夹
+  error_create_cycle_in_folder_dependency: create cycle in folder dependency
+  error_contains_invalid_character: 含有无效字符
+  error_file_commit_require_uploaded_file: 文件提交要求上传文件
+  warning_some_files_were_not_commited: "某些文件因验证错误未能被提交: %{files}"
+  error_user_has_not_right_delete_folder: 用户没有权限删除文件夹
+  error_user_has_not_right_delete_file: 用户没有权限删除文件
+  notice_entries_deleted: 条目已删除
+  warning_some_entries_were_not_deleted: "某些条目未被删除: %{entries}"
+  question_do_you_really_want_to_delete_entries: 您确定删除所选的条目吗?
+  title_delete_checked: 删除选中
+  title_number_of_files_in_directory: 目录总文件个数
+  title_filename_for_download: 用于下载或zip归档的文件名
+  label_number_of_folders: Folders
+  label_number_of_documents: Documents
+  label_zip_names_encoding: Zip文件名编码
+  note_zip_names_encoding_iconv: Iconv is used for charset conversion from utf-8 to target encoding
+  error_file_storage_directory_does_not_exist: 文件存储目录不存在或不能创建
+  error_file_can_not_be_created: 文件未能在存储目录中创建
+  error_wrong_zip_encoding: 不正确的Zip编码
+  warning_xapian_not_available: Xapian not available
+  menu_dmsf: 文档管家
+  label_physical_file_delete: 物理删除文件
+  user_is_not_project_member: 您不是该项目的成员
+  heading_access_downloads_emails: 存取次数
+  heading_access_first: 首次
+  heading_access_last: 末次
+  label_dmsf_updated: DMSF updated
+  title_total_size_of_all_files: 文件夹所有文件总大小
+  project_module_dmsf: 文档管家
   
-# Not translated  
+  # Not translated  
   
-  :warning_no_project_to_copy_file_to: "No project to copy file to"
-  :comment_copied_from: "Copied from %{source}"
-  :notice_file_copied: "File copied"
-  :notice_file_moved: "File moved"
-  :label_target_project: "Target project"
-  :label_target_folder: "Target folder"
-  :title_copy_or_move: "Copy/Move"
-  :label_dmsf_folder_plural: "Dmsf folders"
-  :comment_moved_from: "Moved from %{source}"
-  :error_target_folder_same: "Target folder and project are the same as current"
-  :error_file_cannot_be_moved: "File can't be moved"
-  :error_file_cannot_be_copied: "File can't be copied"
-  :warning_no_project_to_copy_folder_to: "No project to copy folder to"
-  :title_copy: "Copy"
-  :error_folder_cannot_be_copied: "Folder can't be copied"
-  :notice_folder_copied: "Folder copied"
+  warning_no_project_to_copy_file_to: No project to copy file to
+  comment_copied_from: "Copied from %{source}"
+  notice_file_copied: File copied
+  notice_file_moved: File moved
+  label_target_project: Target project
+  label_target_folder: Target folder
+  title_copy_or_move: Copy/Move
+  label_dmsf_folder_plural: Dmsf folders
+  comment_moved_from: "Moved from %{source}"
+  error_target_folder_same: Target folder and project are the same as current
+  error_file_cannot_be_moved: "File can't be moved"
+  error_file_cannot_be_copied: "File can't be copied"
+  warning_no_project_to_copy_folder_to: No project to copy folder to
+  title_copy: Copy
+  error_folder_cannot_be_copied: "Folder can't be copied"
+  notice_folder_copied: Folder copied
   
-  :error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
-  :note_maximum_email_filesize: "Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB."
-  :label_maximum_email_filesize: "Maximum email attachment size"
-  :header_minimum_filesize: "File Error."
-  :error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
-  :parent_directory: "Parent Directory"
-  :note_webdav: "Webdav once enabled can be found at http://.../dmsf/webdav/"
-  :label_webdav: "Webdav functionality"
-  :label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
+  error_max_email_filesize_exceeded: "You've exceeded the maximum filesize for sending via email. (%{number} MB)"
+  note_maximum_email_filesize: Limits maximum filesize that can be sent via email. 0 means unlimited. Number is in MB.
+  label_maximum_email_filesize: Maximum email attachment size
+  header_minimum_filesize: File Error.
+  error_minimum_filesize: "The file %{file} is 0 bytes and will not be attached."
+  parent_directory: Parent Directory
+  note_webdav: Webdav once enabled can be found at http://.../dmsf/webdav/
+  label_webdav: Webdav functionality
+  label_dmsf_plural: "Copy DMSF files and folders (%{files} files in %{folders} folders)"
 
-  :warning_folder_already_locked: "This folder is already locked"
-  :notice_folder_locked: "The folder was successfully locked"
-  :warning_folder_not_locked: "Unfortunately, the folder could not be locked"
-  :notice_folder_unlocked: "The folder was successfully unlocked"
-  :error_only_user_that_locked_folder_can_unlock_it: "You are not authorised to unlock this folder"
-  :title_folder_parent_locked: "Parent folder %{name} is locked"
-  :title_file_parent_locked: "Parent folder %{name} is locked"
-  :title_unlock_folder: "Unlock to allow changes for other members"
-  :title_lock_folder: "Lock to prevent changes for other members"
+  warning_folder_already_locked: This folder is already locked
+  notice_folder_locked: The folder was successfully locked
+  warning_folder_not_locked: Unfortunately, the folder could not be locked
+  notice_folder_unlocked: The folder was successfully unlocked
+  error_only_user_that_locked_folder_can_unlock_it: You are not authorised to unlock this folder
+  title_folder_parent_locked: "Parent folder %{name} is locked"
+  title_file_parent_locked: "Parent folder %{name} is locked"
+  title_unlock_folder: Unlock to allow changes for other members
+  title_lock_folder: Lock to prevent changes for other members
 
-  :select_option_webdav_readonly: "Read-only"
-  :select_option_webdav_readwrite: "Read/Write"
-  :label_webdav_strategy: "Webdav strategy"
-  :note_webdav_strategy: "Enables the administrator to decide if webdav is a read-only or read-write platform for end users."
-  
\ No newline at end of file
+  select_option_webdav_readonly: Read-only
+  select_option_webdav_readwrite: Read/Write
+  label_webdav_strategy: Webdav strategy
+  note_webdav_strategy: Enables the administrator to decide if webdav is a read-only or read-write platform for end users.  
+  
+  error_unable_delete_dmsf_workflow: Unable to delete the workflow
+  error_empty_note: "The note can't be empty"
+  error_workflow_assign: An error occured while assigning
+  error_cannot_start_workflow: "Workflow can't be started"
+  error_cannot_renumber_steps: "Steps can't be renumbered"
+  label_dmsf_workflow_new: New approval workflow
+  label_dmsf_workflow: Approval Workflow
+  label_dmsf_workflow_plural: Approval workflows
+  label_dmsf_workflow_step: Step
+  label_dmsf_workflow_step_plural: Steps
+  label_dmsf_workflow_approval: Approval
+  label_dmsf_workflow_approval_plural: Approvals
+  label_dmsf: DMSF
+  label_dmsf_wokflow_action_approve: Approve
+  label_dmsf_wokflow_action_reject: Reject
+  label_dmsf_wokflow_action_delegate: Delegate to
+  label_dmsf_wokflow_action_assign: Assign an approval workflow
+  label_dmsf_wokflow_action_start: Start workflow
+  label_action: Action
+  label_note: Note  
+  title_none: None
+  title_rejection: Rejection
+  title_delegation: Delegation
+  title_assignment: Assignment
+  title_start: Start  
+  title_dmsf_workflow_log: Approval Workflow Log
+  title_assigned: Assigned
+  title_approval: Approval
+  title_rejected: Rejected
+  dmsf_and: AND
+  dmsf_or: OR
+  dmsf_new_step: New step  
+  message_dmsf_wokflow_note: Your note...
+  info_revision: "r%{rev}"
+  link_workflow: Workflow  
+  notice_workflow_started: Approval workflow successfully started
\ No newline at end of file